diff --git a/share/completions/abook.fish b/share/completions/abook.fish
index 97b144b02..a2dc51b97 100644
--- a/share/completions/abook.fish
+++ b/share/completions/abook.fish
@@ -1,16 +1,16 @@
 
 complete -c abook -s h -d 'Show usage'
 complete -c abook -s C -l config -d 'Use an alternative configuration file' -r
-complete -c abook      -l datafile -d 'Use an alternative addressbook file' -r
-complete -c abook      -l mutt-query -d 'Make a query for mutt' -x
-complete -c abook      -l add-email  -d 'Read email message from stdin and add the sender'
-complete -c abook      -l add-email-quiet -d 'Same as --add-email. Without confirmation'
-complete -c abook      -l convert  -d 'Convert address book files'
+complete -c abook -l datafile -d 'Use an alternative addressbook file' -r
+complete -c abook -l mutt-query -d 'Make a query for mutt' -x
+complete -c abook -l add-email -d 'Read email message from stdin and add the sender'
+complete -c abook -l add-email-quiet -d 'Same as --add-email. Without confirmation'
+complete -c abook -l convert -d 'Convert address book files'
 
 set -l convert 'contains -- --convert (commandline -po)'
-complete -c abook      -l informat -d 'Input file format' -xa '(__fish_complete_abook_formats in)' -n $convert
-complete -c abook      -l outformat -d 'Output file format' -xa '(__fish_complete_abook_formats out)' -n $convert
-complete -c abook      -l infile    -d 'Input file (default: stdin)' -r -n $convert
-complete -c abook      -l outfile   -d 'Output file (default: stdout)' -r -n $convert
+complete -c abook -l informat -d 'Input file format' -xa '(__fish_complete_abook_formats in)' -n $convert
+complete -c abook -l outformat -d 'Output file format' -xa '(__fish_complete_abook_formats out)' -n $convert
+complete -c abook -l infile -d 'Input file (default: stdin)' -r -n $convert
+complete -c abook -l outfile -d 'Output file (default: stdout)' -r -n $convert
 
-complete -c abook      -l formats   -d 'Print available formats'
+complete -c abook -l formats -d 'Print available formats'
diff --git a/share/completions/ack.fish b/share/completions/ack.fish
index 60db3d4c8..e94fcf613 100644
--- a/share/completions/ack.fish
+++ b/share/completions/ack.fish
@@ -83,9 +83,9 @@ complete -c ack -l thpppt -d 'Bill the Cat'
 complete -c ack -l bar -d 'The warning admiral'
 
 # File types
-if type ack > /dev/null
-	for type in (ack --dump 2>/dev/null | perl -lne 'print $1 if /^\s+--type-add=([^:]+)/' | uniq)
-		complete -c ack -l $type -d "Allow $type file type"
-		complete -c ack -l no$type -l no-$type -d "Don't allow $type file type"
-	end
+if type ack >/dev/null
+    for type in (ack --dump 2>/dev/null | perl -lne 'print $1 if /^\s+--type-add=([^:]+)/' | uniq)
+        complete -c ack -l $type -d "Allow $type file type"
+        complete -c ack -l no$type -l no-$type -d "Don't allow $type file type"
+    end
 end
diff --git a/share/completions/adb.fish b/share/completions/adb.fish
index 559a3e3bc..b055347ee 100644
--- a/share/completions/adb.fish
+++ b/share/completions/adb.fish
@@ -59,17 +59,17 @@ function __fish_adb_list_uninstallable_packages
 end
 
 function __fish_adb_list_files
-   set -l token (commandline -ct)
+    set -l token (commandline -ct)
 
-   # Have tab complete show initial / if nothing on current token
-   if test -z "$token"
-       set token "/"
-   end
+    # Have tab complete show initial / if nothing on current token
+    if test -z "$token"
+        set token "/"
+    end
 
-   # Return list of directories suffixed with '/'
-   __fish_adb_run_command find -H "$token*" -maxdepth 0 -type d 2>/dev/null | awk '{print $1"/"}'
-   # Return list of files
-   __fish_adb_run_command find -H "$token*" -maxdepth 0 -type f 2>/dev/null
+    # Return list of directories suffixed with '/'
+    __fish_adb_run_command find -H "$token*" -maxdepth 0 -type d 2>/dev/null | awk '{print $1"/"}'
+    # Return list of files
+    __fish_adb_run_command find -H "$token*" -maxdepth 0 -type f 2>/dev/null
 end
 
 
diff --git a/share/completions/amixer.fish b/share/completions/amixer.fish
index a901fe35d..724e3e87c 100644
--- a/share/completions/amixer.fish
+++ b/share/completions/amixer.fish
@@ -2,13 +2,13 @@ set -l cmds 'scontrols scontents controls contents sget sset cset cget set get'
 complete -c amixer -xa "$cmds" -n "not __fish_seen_subcommand_from $cmds"
 complete -c amixer -n '__fish_seen_subcommand_from sset sget get set' -xa "(amixer scontrols | cut --delimiter \' --fields 2)"
 
-complete -c amixer -s h -l help        -d 'this help'
-complete -c amixer -s c -l card -r     -d 'select the card'
-complete -c amixer -s D -l device -r   -d 'select the device, default \'default\''
-complete -c amixer -s d -l debug       -d 'debug mode'
-complete -c amixer -s n -l nocheck     -d 'do not perform range checking'
-complete -c amixer -s v -l version     -d 'print version of this program'
-complete -c amixer -s q -l quiet       -d 'be quiet'
-complete -c amixer -s i -l inactive    -d 'show also inactive controls'
-complete -c amixer -s a -l abstract    -d 'select abstraction level' -xa 'none basic'
-complete -c amixer -s s -l stdin       -d 'Read and execute commands from stdin sequentially'
+complete -c amixer -s h -l help -d 'this help'
+complete -c amixer -s c -l card -r -d 'select the card'
+complete -c amixer -s D -l device -r -d 'select the device, default \'default\''
+complete -c amixer -s d -l debug -d 'debug mode'
+complete -c amixer -s n -l nocheck -d 'do not perform range checking'
+complete -c amixer -s v -l version -d 'print version of this program'
+complete -c amixer -s q -l quiet -d 'be quiet'
+complete -c amixer -s i -l inactive -d 'show also inactive controls'
+complete -c amixer -s a -l abstract -d 'select abstraction level' -xa 'none basic'
+complete -c amixer -s s -l stdin -d 'Read and execute commands from stdin sequentially'
diff --git a/share/completions/animate.fish b/share/completions/animate.fish
index 70c9323db..fadc47945 100644
--- a/share/completions/animate.fish
+++ b/share/completions/animate.fish
@@ -1,65 +1,65 @@
-complete -c animate -o alpha                       -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(animate -list alpha)'
-complete -c animate -o authenticate                -d 'Decipher image with this password [password]'
-complete -c animate -o backdrop                    -d 'Display image centered on a backdrop'
-complete -c animate -o channel                     -d 'Apply option to select image channels [type]' -xa '(animate -list channel)'
-complete -c animate -o colormap                    -d 'Shared or Private [type]' -x
-complete -c animate -o colorspace                  -d 'Alternate image colorspace [type]' -xa '(animate -list colorspace)'
-complete -c animate -o decipher                    -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c animate -o define                      -d 'Define one or more image format options [format:option]'
-complete -c animate -o delay                       -d 'Display the next image after pausing [value]'
-complete -c animate -o density                     -d 'Horizontal and vertical density of the image [geometry]'
-complete -c animate -o depth                       -d 'Image depth [value]'
-complete -c animate -o display                     -d 'Display image to this X server [server]'
-complete -c animate -o dispose                     -d 'Layer disposal method [method]' -xa '(animate -list dispose)'
-complete -c animate -o dither                      -d 'Apply error diffusion to image [method]' -xa '(animate -list dither)'
-complete -c animate -o filter                      -d 'Use this filter when resizing an image [type]' -xa '(animate -list filter)'
-complete -c animate -o format                      -d 'Output formatted image characteristics ["string"]'
-complete -c animate -o gamma                       -d 'Level of gamma correction [value]'
-complete -c animate -o geometry                    -d 'Preferred size and location of the Image window [geometry]'
-complete -c animate -o gravity                     -d 'Horizontal and vertical backdrop placement [type]' -xa '(animate -list gravity)'
-complete -c animate -o identify                    -d 'Identify the format and characteristics of the image'
-complete -c animate -o immutable                   -d 'Displayed image cannot be modified'
-complete -c animate -o interlace                   -d 'Type of image interlacing scheme [type]' -xa '(animate -list interlace)'
-complete -c animate -o interpolate                 -d 'Pixel color interpolation method [method]' -xa '(animate -list interpolate)'
-complete -c animate -o limit                       -d 'Pixel cache resource limit [type value]' -x
-complete -c animate -o loop                        -d 'Loop images then exit [iterations]'
-complete -c animate -o map                         -d 'Display image using this Standard Colormap [type]' -x
-complete -c animate -o monitor                     -d 'Monitor progress '
-complete -c animate -o pause                       -d 'Seconds to pause before reanimating'
-complete -c animate -o page                        -d 'Size and location of an image canvas (setting) [geometry]'
-complete -c animate -o quantize                    -d 'Reduce colors in this colorspace [colorspace]' -xa '(animate -list colorspace)'
-complete -c animate -o quiet                       -d 'Suppress all warning messages'
-complete -c animate -o regard-warnings             -d 'Pay attention to warning messages'
-complete -c animate -o remote                      -d 'Command execute a command in an remote display process'
-complete -c animate -o respect-parentheses         -d 'Settings remain in effect until parenthesis boundary'
-complete -c animate -o sampling-factor             -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c animate -o seed                        -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c animate -o set                         -d 'Attribute set an image attribute [ value]'
-complete -c animate -o size                        -d 'Width and height of image [geometry]'
-complete -c animate -o transparent-color           -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c animate -o treedepth                   -d 'Color tree depth [value]'
-complete -c animate -o verbose                     -d 'Print detailed information about the image'
-complete -c animate -o visual                      -d 'Display image using this visual type [type]' -x
-complete -c animate -o virtual-pixel               -d 'Virtual pixel access method [method]' -xa '(animate -list virtual-pixel)'
-complete -c animate -o window                      -d 'Display image to background of this window [id]' -xa 'root (__fish_print_xwindows)'
-complete -c animate -o colors                      -d 'Preferred number of colors in the image [value]'
-complete -c animate -o crop                        -d 'Preferred size and location of the cropped image [geometry]'
-complete -c animate -o extract                     -d 'Extract area from image [geometry]'
-complete -c animate -o monochrome                  -d 'Transform image to black and white'
-complete -c animate -o repage                      -d 'Size and location of an image canvas (operator) [geometry]'
-complete -c animate -o resample                    -d 'Change the resolution of an image [geometry]'
-complete -c animate -o resize                      -d 'Resize the image [geometry]'
-complete -c animate -o rotate                      -d 'Apply Paeth rotation to the image [degrees]'
-complete -c animate -o strip                       -d 'Strip image of all profiles and comments'
-complete -c animate -o thumbnail                   -d 'Create a thumbnail of the image [geometry]'
-complete -c animate -o trim                        -d 'Trim image edges'
-complete -c animate -o coalesce                    -d 'Merge a sequence of images'
-complete -c animate -o flatten                     -d 'Flatten a sequence of images'
-complete -c animate -o debug                       -d 'Display copious debugging information [events]' -xa '(animate -list debug)'
-complete -c animate -o help                        -d 'Print program options'
-complete -c animate -o list                        -d 'Print a list of supported option arguments [type]' -xa '(animate -list list)'
-complete -c animate -o log                         -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c animate -o version                     -d 'Print version information Press any button to map or unmap the Command widget'
-complete -c animate -o matte                       -d 'Store matte channel if the image has one'
-complete -c animate -o scenes                      -d 'Range image scene range'
-complete -c animate -o support                     -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c animate -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(animate -list alpha)'
+complete -c animate -o authenticate -d 'Decipher image with this password [password]'
+complete -c animate -o backdrop -d 'Display image centered on a backdrop'
+complete -c animate -o channel -d 'Apply option to select image channels [type]' -xa '(animate -list channel)'
+complete -c animate -o colormap -d 'Shared or Private [type]' -x
+complete -c animate -o colorspace -d 'Alternate image colorspace [type]' -xa '(animate -list colorspace)'
+complete -c animate -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c animate -o define -d 'Define one or more image format options [format:option]'
+complete -c animate -o delay -d 'Display the next image after pausing [value]'
+complete -c animate -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c animate -o depth -d 'Image depth [value]'
+complete -c animate -o display -d 'Display image to this X server [server]'
+complete -c animate -o dispose -d 'Layer disposal method [method]' -xa '(animate -list dispose)'
+complete -c animate -o dither -d 'Apply error diffusion to image [method]' -xa '(animate -list dither)'
+complete -c animate -o filter -d 'Use this filter when resizing an image [type]' -xa '(animate -list filter)'
+complete -c animate -o format -d 'Output formatted image characteristics ["string"]'
+complete -c animate -o gamma -d 'Level of gamma correction [value]'
+complete -c animate -o geometry -d 'Preferred size and location of the Image window [geometry]'
+complete -c animate -o gravity -d 'Horizontal and vertical backdrop placement [type]' -xa '(animate -list gravity)'
+complete -c animate -o identify -d 'Identify the format and characteristics of the image'
+complete -c animate -o immutable -d 'Displayed image cannot be modified'
+complete -c animate -o interlace -d 'Type of image interlacing scheme [type]' -xa '(animate -list interlace)'
+complete -c animate -o interpolate -d 'Pixel color interpolation method [method]' -xa '(animate -list interpolate)'
+complete -c animate -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c animate -o loop -d 'Loop images then exit [iterations]'
+complete -c animate -o map -d 'Display image using this Standard Colormap [type]' -x
+complete -c animate -o monitor -d 'Monitor progress '
+complete -c animate -o pause -d 'Seconds to pause before reanimating'
+complete -c animate -o page -d 'Size and location of an image canvas (setting) [geometry]'
+complete -c animate -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(animate -list colorspace)'
+complete -c animate -o quiet -d 'Suppress all warning messages'
+complete -c animate -o regard-warnings -d 'Pay attention to warning messages'
+complete -c animate -o remote -d 'Command execute a command in an remote display process'
+complete -c animate -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c animate -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c animate -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c animate -o set -d 'Attribute set an image attribute [ value]'
+complete -c animate -o size -d 'Width and height of image [geometry]'
+complete -c animate -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c animate -o treedepth -d 'Color tree depth [value]'
+complete -c animate -o verbose -d 'Print detailed information about the image'
+complete -c animate -o visual -d 'Display image using this visual type [type]' -x
+complete -c animate -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(animate -list virtual-pixel)'
+complete -c animate -o window -d 'Display image to background of this window [id]' -xa 'root (__fish_print_xwindows)'
+complete -c animate -o colors -d 'Preferred number of colors in the image [value]'
+complete -c animate -o crop -d 'Preferred size and location of the cropped image [geometry]'
+complete -c animate -o extract -d 'Extract area from image [geometry]'
+complete -c animate -o monochrome -d 'Transform image to black and white'
+complete -c animate -o repage -d 'Size and location of an image canvas (operator) [geometry]'
+complete -c animate -o resample -d 'Change the resolution of an image [geometry]'
+complete -c animate -o resize -d 'Resize the image [geometry]'
+complete -c animate -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c animate -o strip -d 'Strip image of all profiles and comments'
+complete -c animate -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c animate -o trim -d 'Trim image edges'
+complete -c animate -o coalesce -d 'Merge a sequence of images'
+complete -c animate -o flatten -d 'Flatten a sequence of images'
+complete -c animate -o debug -d 'Display copious debugging information [events]' -xa '(animate -list debug)'
+complete -c animate -o help -d 'Print program options'
+complete -c animate -o list -d 'Print a list of supported option arguments [type]' -xa '(animate -list list)'
+complete -c animate -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c animate -o version -d 'Print version information Press any button to map or unmap the Command widget'
+complete -c animate -o matte -d 'Store matte channel if the image has one'
+complete -c animate -o scenes -d 'Range image scene range'
+complete -c animate -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
diff --git a/share/completions/apm.fish b/share/completions/apm.fish
index 15622b417..da226eead 100644
--- a/share/completions/apm.fish
+++ b/share/completions/apm.fish
@@ -178,7 +178,7 @@ atom.io registry"
     complete -x -c apm -n "__fish_apm_using_command login" -l token -d "Specify API token"
 
     # outdated & upgrade & update
-    set  -l upgrade_commands "outdated upgrade update"
+    set -l upgrade_commands "outdated upgrade update"
     complete -f -c apm -n '__fish_apm_needs_command' -a $upgrade_commands -d "Upgrade out of date packages"
     complete -f -c apm -n "__fish_apm_using_command $upgrade_commands" -l json -d "Output outdated packages as JSON array"
     complete -x -c apm -n "__fish_apm_using_command $upgrade_commands" -l compatible -d "Only install packages/themes compatible with specified Atom version"
diff --git a/share/completions/apropos.fish b/share/completions/apropos.fish
index 309358255..8344a3e96 100644
--- a/share/completions/apropos.fish
+++ b/share/completions/apropos.fish
@@ -1,9 +1,9 @@
 
 function __fish_complete_apropos
-	if test (commandline -ct)
-		set str (commandline -ct)
-		apropos $str 2>/dev/null |sed -e "s/^\(.*$str\([^ ]*\).*\)\$/$str\2"\t"\1/"
-	end
+    if test (commandline -ct)
+        set str (commandline -ct)
+        apropos $str 2>/dev/null | sed -e "s/^\(.*$str\([^ ]*\).*\)\$/$str\2"\t"\1/"
+    end
 end
 
 complete -xc apropos -a '(__fish_complete_apropos)' -d "whatis entry"
diff --git a/share/completions/apt-cache.fish b/share/completions/apt-cache.fish
index ce6df53cb..4070a343b 100644
--- a/share/completions/apt-cache.fish
+++ b/share/completions/apt-cache.fish
@@ -30,12 +30,12 @@ complete -r -c apt-cache -s c -l config-file -d "Specify config file"
 complete -x -c apt-cache -s o -l option -d "Specify options"
 
 function __fish_apt-cache_use_package -d 'Test if apt command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i contains show showpkg showsrc depends rdepends dotty policy
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i contains show showpkg showsrc depends rdepends dotty policy
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c apt-cache -n '__fish_apt-cache_use_package' -a '(__fish_print_packages)' -d 'Package'
diff --git a/share/completions/apt-get.fish b/share/completions/apt-get.fish
index 3aebaab77..f691ce87f 100644
--- a/share/completions/apt-get.fish
+++ b/share/completions/apt-get.fish
@@ -1,21 +1,21 @@
 #completion for apt-get
 
 function __fish_apt_no_subcommand -d 'Test if apt has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove purge source build-dep check clean autoclean changelog
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove purge source build-dep check clean autoclean changelog
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_apt_use_package -d 'Test if apt command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i contains install remove purge build-dep changelog
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i contains install remove purge build-dep changelog
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
diff --git a/share/completions/apt-listbugs.fish b/share/completions/apt-listbugs.fish
index 4e6341d47..87e8802c0 100644
--- a/share/completions/apt-listbugs.fish
+++ b/share/completions/apt-listbugs.fish
@@ -1,6 +1,6 @@
 #apt-listbugs
 complete -c apt-listbugs -s h -l help -d "Display help and exit"
-complete -f -c apt-listbugs -s s -l severity -a "critical grave"  -d "Set severity"
+complete -f -c apt-listbugs -s s -l severity -a "critical grave" -d "Set severity"
 complete -f -c apt-listbugs -s T -l tag -d "Tags you want to see"
 complete -f -c apt-listbugs -s S -l stats -a "outstanding 'pending upload' resolved done open" -d "Bug-status you want to see"
 complete -f -c apt-listbugs -s l -l showless -d "Ignore bugs in your system"
diff --git a/share/completions/apt-mark.fish b/share/completions/apt-mark.fish
index e1caf2513..c118609b8 100644
--- a/share/completions/apt-mark.fish
+++ b/share/completions/apt-mark.fish
@@ -1,21 +1,21 @@
 #completion for apt-mark
 
 function __fish_apt_no_subcommand -d 'Test if apt has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i auto manual hold unhold showauto showmanual showhold
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i auto manual hold unhold showauto showmanual showhold
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_apt_use_package -d 'Test if apt command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i contains auto manual hold unhold
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i contains auto manual hold unhold
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c apt-mark -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
diff --git a/share/completions/apt.fish b/share/completions/apt.fish
index 6bc06a84e..9b4d46895 100644
--- a/share/completions/apt.fish
+++ b/share/completions/apt.fish
@@ -20,58 +20,58 @@ complete -c apt -n "__fish_seen_subcommand_from $pkg_subcmds" -a '(__fish_print_
 complete -c apt -n "__fish_seen_subcommand_from $installed_pkg_subcmds" -a '(__fish_print_packages --installed | string match -re -- "(?:\\b|_)"(commandline -ct | string escape --style=regex) | head -n 250)' -d 'Package'
 
 # Support flags
-complete -x -f -c apt -s h -l help     -d 'Display help'
-complete -x -f -c apt -s v -l version  -d 'Display version and exit'
+complete -x -f -c apt -s h -l help -d 'Display help'
+complete -x -f -c apt -s v -l version -d 'Display version and exit'
 
 # General options
-complete -f -c apt -s o -l option       -d 'Set a configuration option'
-complete -f -c apt -s c -l config-file  -d 'Configuration file'
-complete -f -c apt -s t                 -d 'Target release'
+complete -f -c apt -s o -l option -d 'Set a configuration option'
+complete -f -c apt -s c -l config-file -d 'Configuration file'
+complete -f -c apt -s t -d 'Target release'
 
 # List
-__fish_apt_subcommand list                  -d 'List packages'
-__fish_apt_option     list -l installed     -d 'Installed packages'
-__fish_apt_option     list -l upgradable    -d 'Upgradable packages'
-__fish_apt_option     list -l all-versions  -d 'Show all versions of any package'
+__fish_apt_subcommand list -d 'List packages'
+__fish_apt_option list -l installed -d 'Installed packages'
+__fish_apt_option list -l upgradable -d 'Upgradable packages'
+__fish_apt_option list -l all-versions -d 'Show all versions of any package'
 
 # Search
-__fish_apt_subcommand search -r        -d 'Search for packages'
+__fish_apt_subcommand search -r -d 'Search for packages'
 
 # Search
-__fish_apt_subcommand show -r          -d 'Show package information'
+__fish_apt_subcommand show -r -d 'Show package information'
 
 # Install
-__fish_apt_subcommand install -r       -d 'Install packages'
+__fish_apt_subcommand install -r -d 'Install packages'
 
 # Remove
-__fish_apt_subcommand remove -r        -d 'Remove packages'
+__fish_apt_subcommand remove -r -d 'Remove packages'
 
 # Edit sources
-__fish_apt_subcommand edit-sources     -d 'Edit sources list'
+__fish_apt_subcommand edit-sources -d 'Edit sources list'
 
 # Update
-__fish_apt_subcommand update -x        -d 'Update package list'
+__fish_apt_subcommand update -x -d 'Update package list'
 
 # Upgrade
-__fish_apt_subcommand upgrade -r       -d 'Upgrade packages'
+__fish_apt_subcommand upgrade -r -d 'Upgrade packages'
 
 # Full Upgrade
-__fish_apt_subcommand full-upgrade -r  -d 'Upgrade packages, removing others when needed'
+__fish_apt_subcommand full-upgrade -r -d 'Upgrade packages, removing others when needed'
 
 # Purge
-__fish_apt_subcommand purge -x         -d 'Remove packages and delete their config files'
+__fish_apt_subcommand purge -x -d 'Remove packages and delete their config files'
 
 # Changelog
-__fish_apt_subcommand changelog -r     -d 'Download and display package changelog'
+__fish_apt_subcommand changelog -r -d 'Download and display package changelog'
 
 # Autoremove
-__fish_apt_subcommand autoremove       -d 'Remove packages no longer needed as dependencies'
+__fish_apt_subcommand autoremove -d 'Remove packages no longer needed as dependencies'
 
 # Policy
-__fish_apt_subcommand policy -x        -d 'Display source or package priorities'
+__fish_apt_subcommand policy -x -d 'Display source or package priorities'
 
 # Depends
-__fish_apt_subcommand depends -r       -d 'List package dependencies'
+__fish_apt_subcommand depends -r -d 'List package dependencies'
 
 # Rdepends
-__fish_apt_subcommand rdepends -r      -d 'List package reverse dependencies'
+__fish_apt_subcommand rdepends -r -d 'List package reverse dependencies'
diff --git a/share/completions/aptitude.fish b/share/completions/aptitude.fish
index 2267e0c78..089ffdd23 100644
--- a/share/completions/aptitude.fish
+++ b/share/completions/aptitude.fish
@@ -1,68 +1,68 @@
 #completion for aptitude
 
-function __fish_apt_no_subcommand  -d 'Test if aptitude has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i autoclean clean forget-new keep-all update safe-upgrade changelog full-upgrade download forbid-version hold install keep markauto purge reinstall remove show unhold unmarkauto search help
-			return 1
-		end
-	end
-	return 0
+function __fish_apt_no_subcommand -d 'Test if aptitude has yet to be given the subcommand'
+    for i in (commandline -opc)
+        if contains -- $i autoclean clean forget-new keep-all update safe-upgrade changelog full-upgrade download forbid-version hold install keep markauto purge reinstall remove show unhold unmarkauto search help
+            return 1
+        end
+    end
+    return 0
 end
 
-function __fish_apt_use_package  -d 'Test if aptitude command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i changelog full-upgrade download forbid-version hold install keep-all markauto purge reinstall remove show unhold unmarkauto
-			return 0
-		end
-	end
-	return 1
+function __fish_apt_use_package -d 'Test if aptitude command should have packages as potential completion'
+    for i in (commandline -opc)
+        if contains -- $i changelog full-upgrade download forbid-version hold install keep-all markauto purge reinstall remove show unhold unmarkauto
+            return 0
+        end
+    end
+    return 1
 end
 
-complete -c aptitude -n '__fish_apt_use_package' -a '(__fish_print_packages)'  -d 'Package'
+complete -c aptitude -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
 
-complete -c aptitude -s h -l help  -d 'Display a brief help message. Identical to the help action'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'autoclean'  -d 'Remove any cached packages which can no longer be downloaded'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'clean'  -d 'Remove all downloaded .deb files from the package cache directory'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forget-new'  -d 'Forget all internal information about what packages are \'new\''
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep-all'  -d 'Cancel all scheduled actions on all packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'update'  -d 'Update the list of available packages from the apt sources'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'safe-upgrade'  -d 'Upgrade installed packages to their most recent version'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'changelog'  -d 'Download and displays the Debian changelog for the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'full-upgrade'  -d 'Upgrade, removing or installing packages as necessary'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'download'  -d 'Download the packages to the current directory'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forbid-version'  -d 'Forbid the upgrade to a particular version'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'hold'  -d 'Ignore the packages by future upgrade commands'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'install'  -d 'Install the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep'  -d 'Cancel any scheduled actions on the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'markauto'  -d 'Mark packages as automatically installed'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'purge'  -d 'Remove and delete all associated configuration and data files'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'reinstall'  -d 'Reinstall the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'remove'  -d 'Remove the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'show'  -d 'Display detailed information about the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unhold'  -d 'Consider the packages by future upgrade commands'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unmarkauto'  -d 'Mark packages as manually installed'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'search'  -d 'Search for packages matching one of the patterns'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'help'  -d 'Display brief summary of the available commands and options'
+complete -c aptitude -s h -l help -d 'Display a brief help message. Identical to the help action'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'autoclean' -d 'Remove any cached packages which can no longer be downloaded'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'clean' -d 'Remove all downloaded .deb files from the package cache directory'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forget-new' -d 'Forget all internal information about what packages are \'new\''
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep-all' -d 'Cancel all scheduled actions on all packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'update' -d 'Update the list of available packages from the apt sources'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'safe-upgrade' -d 'Upgrade installed packages to their most recent version'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'changelog' -d 'Download and displays the Debian changelog for the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'full-upgrade' -d 'Upgrade, removing or installing packages as necessary'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'download' -d 'Download the packages to the current directory'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forbid-version' -d 'Forbid the upgrade to a particular version'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'hold' -d 'Ignore the packages by future upgrade commands'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'install' -d 'Install the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep' -d 'Cancel any scheduled actions on the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'markauto' -d 'Mark packages as automatically installed'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'purge' -d 'Remove and delete all associated configuration and data files'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'reinstall' -d 'Reinstall the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'remove' -d 'Remove the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'show' -d 'Display detailed information about the packages'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unhold' -d 'Consider the packages by future upgrade commands'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'unmarkauto' -d 'Mark packages as manually installed'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'search' -d 'Search for packages matching one of the patterns'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'help' -d 'Display brief summary of the available commands and options'
 
-complete -c aptitude -s D -l show-deps  -d 'Show explanations of automatic installations and removals'
-complete -c aptitude -s d -l download-only  -d 'Download Only'
-complete -c aptitude -s f -l fix-broken  -d 'Correct broken dependencies'
-complete -c aptitude -l purge-unused  -d 'Purge packages that are not required by any installed package'
-complete -c aptitude -s P -l prompt  -d 'Always display a prompt'
-complete -c aptitude -s R -l without-recommends  -d 'Do not treat recommendations as dependencies'
-complete -c aptitude -s r -l with-recommends  -d 'Treat recommendations as dependencies'
-complete -c aptitude -s s -l simulate  -d 'Don\'t perform the actions. Just show them'
-complete -c aptitude -l schedule-only  -d 'Schedule operations to be performed in the future'
-complete -c aptitude -s q -l quiet  -d 'Suppress incremental progress indicators'
-complete -c aptitude -s V -l show-versions  -d 'Show which versions of packages will be installed'
-complete -c aptitude -s v -l verbose  -d 'Display extra information'
-complete -c aptitude -l version  -d 'Display the version of aptitude and compile information'
-complete -c aptitude -l visual-preview  -d 'Start up the visual interface and display its preview screen'
-complete -c aptitude -s y -l assume-yes  -d 'Assume the answer yes for all question prompts'
-complete -c aptitude -s Z  -d 'Show how much disk space will be used or freed'
-complete -r -c aptitude -s F -l display-format  -d 'Specify the format to be used by the search command'
-complete -r -c aptitude -s t -l target-release  -d 'Set the release from which packages should be installed'
-complete -r -c aptitude -s O -l sort  -d 'Specify the order for the output from the search command'
-complete -r -c aptitude -s o  -d 'Set a configuration file option directly'
-complete -r -c aptitude -s w -l width  -d 'Specify the display width for the output from the search command'
+complete -c aptitude -s D -l show-deps -d 'Show explanations of automatic installations and removals'
+complete -c aptitude -s d -l download-only -d 'Download Only'
+complete -c aptitude -s f -l fix-broken -d 'Correct broken dependencies'
+complete -c aptitude -l purge-unused -d 'Purge packages that are not required by any installed package'
+complete -c aptitude -s P -l prompt -d 'Always display a prompt'
+complete -c aptitude -s R -l without-recommends -d 'Do not treat recommendations as dependencies'
+complete -c aptitude -s r -l with-recommends -d 'Treat recommendations as dependencies'
+complete -c aptitude -s s -l simulate -d 'Don\'t perform the actions. Just show them'
+complete -c aptitude -l schedule-only -d 'Schedule operations to be performed in the future'
+complete -c aptitude -s q -l quiet -d 'Suppress incremental progress indicators'
+complete -c aptitude -s V -l show-versions -d 'Show which versions of packages will be installed'
+complete -c aptitude -s v -l verbose -d 'Display extra information'
+complete -c aptitude -l version -d 'Display the version of aptitude and compile information'
+complete -c aptitude -l visual-preview -d 'Start up the visual interface and display its preview screen'
+complete -c aptitude -s y -l assume-yes -d 'Assume the answer yes for all question prompts'
+complete -c aptitude -s Z -d 'Show how much disk space will be used or freed'
+complete -r -c aptitude -s F -l display-format -d 'Specify the format to be used by the search command'
+complete -r -c aptitude -s t -l target-release -d 'Set the release from which packages should be installed'
+complete -r -c aptitude -s O -l sort -d 'Specify the order for the output from the search command'
+complete -r -c aptitude -s o -d 'Set a configuration file option directly'
+complete -r -c aptitude -s w -l width -d 'Specify the display width for the output from the search command'
 
diff --git a/share/completions/arc.fish b/share/completions/arc.fish
index a4e157d8d..13757afa0 100644
--- a/share/completions/arc.fish
+++ b/share/completions/arc.fish
@@ -41,7 +41,7 @@ complete -f -c arc -n '__fish_arc_needs_command' -l conduit-token -d 'Specify th
 complete -f -c arc -n '__fish_arc_needs_command' -l conduit-version -d 'Force a version'
 complete -f -c arc -n '__fish_arc_needs_command' -l conduit-timeout -d 'Sets the timeout'
 complete -f -c arc -n '__fish_arc_needs_command' -l config -d 'Sets a config'
-complete -f -c arc -n '__fish_arc_needs_command'  -l skip-arcconfig -d 'Skip the working copy configuration file'
+complete -f -c arc -n '__fish_arc_needs_command' -l skip-arcconfig -d 'Skip the working copy configuration file'
 complete -c arc -n '__fish_arc_needs_command' -l arcrc-file -d 'Use provided file instead of ~/.arcrc'
 
 ### shell-complete
diff --git a/share/completions/asp.fish b/share/completions/asp.fish
index 8308f235f..8fdd0e735 100644
--- a/share/completions/asp.fish
+++ b/share/completions/asp.fish
@@ -22,5 +22,5 @@ complete -c asp -n "not __fish_seen_subcommand_from $commands" -a untrack -d "Re
 # This will run into the description race.
 complete -c asp -n "__fish_seen_subcommand_from checkout {diff,short,}log export list-{arches,repos} show update" -a "(asp list-all | string replace -r '.*/' '')" -f
 complete -c asp -n "__fish_seen_subcommand_from checkout {diff,short,}log export list-{arches,repos} show update untrack" -a "(asp list-local | string replace -r '.*/' '')" -f \
--d "Locally tracked package"
+    -d "Locally tracked package"
 
diff --git a/share/completions/aws.fish b/share/completions/aws.fish
index e9bca56b8..f307a0a92 100644
--- a/share/completions/aws.fish
+++ b/share/completions/aws.fish
@@ -4,20 +4,20 @@
 # for `aws` via `fish_update_completions` are pretty useless due to non-standard formatting.
 
 function __s3_is_bucket
-	commandline -ct | string match -q -r -- '^s3://[^/]?$'
+    commandline -ct | string match -q -r -- '^s3://[^/]?$'
 end
 
 function __s3_is_remote_path
-	commandline -ct | string match -q -r -- "^s3://.*/.*"
+    commandline -ct | string match -q -r -- "^s3://.*/.*"
 end
 
 function __s3_ls_buckets
-	aws s3 ls | string replace -rf '.* (\S+)$' 's3://$1/'
+    aws s3 ls | string replace -rf '.* (\S+)$' 's3://$1/'
 end
 
 function __s3_ls_dir
-	set -l dir (commandline -ct | string replace -rf '(s3://.*/).*' '$1')
-	printf "$dir%s\n" (aws s3 ls $dir 2>/dev/null | string replace -fr '^(:?\S+ +\S+ +\S+ |^.*PRE )(.*)' '$2')
+    set -l dir (commandline -ct | string replace -rf '(s3://.*/).*' '$1')
+    printf "$dir%s\n" (aws s3 ls $dir 2>/dev/null | string replace -fr '^(:?\S+ +\S+ +\S+ |^.*PRE )(.*)' '$2')
 end
 
 # S3 remote completions
@@ -30,181 +30,181 @@ complete -c 'aws' -n "not __s3_is_remote_path && __fish_prev_arg_in mv cp rm" -a
 # This list is extracted from the output of `aws help`, which can't be ingested directly,
 # as it emits considerable ANSI output and other terminal control characters.
 set -l aws_services \
-	acm \
-	acm-pca \
-	alexaforbusiness \
-	amplify \
-	apigateway \
-	apigatewaymanagementapi \
-	apigatewayv2 \
-	application-autoscaling \
-	appmesh \
-	appstream \
-	appsync \
-	athena \
-	autoscaling \
-	autoscaling-plans \
-	backup \
-	batch \
-	budgets \
-	ce \
-	chime \
-	cloud9 \
-	clouddirectory \
-	cloudformation \
-	cloudfront \
-	cloudhsm \
-	cloudhsmv2 \
-	cloudsearch \
-	cloudsearchdomain \
-	cloudtrail \
-	cloudwatch \
-	codebuild \
-	codecommit \
-	codepipeline \
-	codestar \
-	cognito-identity \
-	cognito-idp \
-	cognito-sync \
-	comprehend \
-	comprehendmedical \
-	configservice \
-	configure \
-	connect \
-	cur \
-	datapipeline \
-	datasync \
-	dax \
-	deploy \
-	devicefarm \
-	directconnect \
-	discovery \
-	dlm \
-	dms \
-	docdb \
-	ds \
-	dynamodb \
-	dynamodbstreams \
-	ec2 \
-	ecr \
-	ecs \
-	efs \
-	eks \
-	elasticache \
-	elasticbeanstalk \
-	elastictranscoder \
-	elb \
-	elbv2 \
-	emr \
-	es \
-	events \
-	firehose \
-	fms \
-	fsx \
-	gamelift \
-	glacier \
-	globalaccelerator \
-	glue \
-	greengrass \
-	guardduty \
-	health \
-	help \
-	history \
-	iam \
-	importexport \
-	inspector \
-	iot \
-	iot-data \
-	iot-jobs-data \
-	iot1click-devices \
-	iot1click-projects \
-	iotanalytics \
-	kafka \
-	kinesis \
-	kinesis-video-archived-media \
-	kinesis-video-media \
-	kinesisanalytics \
-	kinesisanalyticsv2 \
-	kinesisvideo \
-	kms \
-	lambda \
-	lex-models \
-	lex-runtime \
-	license-manager \
-	lightsail \
-	logs \
-	machinelearning \
-	macie \
-	marketplace-entitlement \
-	marketplacecommerceanalytics \
-	mediaconnect \
-	mediaconvert \
-	medialive \
-	mediapackage \
-	mediastore \
-	mediastore-data \
-	mediatailor \
-	meteringmarketplace \
-	mgh \
-	mobile \
-	mq \
-	mturk \
-	neptune \
-	opsworks \
-	opsworks-cm \
-	organizations \
-	pi \
-	pinpoint \
-	pinpoint-email \
-	pinpoint-sms-voice \
-	polly \
-	pricing \
-	quicksight \
-	ram \
-	rds \
-	rds-data \
-	redshift \
-	rekognition \
-	resource-groups \
-	resourcegroupstaggingapi \
-	robomaker \
-	route53 \
-	route53domains \
-	route53resolver \
-	s3 \
-	s3api \
-	s3control \
-	sagemaker \
-	sagemaker-runtime \
-	sdb \
-	secretsmanager \
-	securityhub \
-	serverlessrepo \
-	servicecatalog \
-	servicediscovery \
-	ses \
-	shield \
-	signer \
-	sms \
-	snowball \
-	sns \
-	sqs \
-	ssm \
-	stepfunctions \
-	storagegateway \
-	sts \
-	support \
-	swf \
-	textract \
-	transcribe \
-	transfer \
-	translate \
-	waf \
-	waf-regional \
-	workdocs \
-	worklink \
-	workmail \
-	workspaces \
-	xray
+    acm \
+    acm-pca \
+    alexaforbusiness \
+    amplify \
+    apigateway \
+    apigatewaymanagementapi \
+    apigatewayv2 \
+    application-autoscaling \
+    appmesh \
+    appstream \
+    appsync \
+    athena \
+    autoscaling \
+    autoscaling-plans \
+    backup \
+    batch \
+    budgets \
+    ce \
+    chime \
+    cloud9 \
+    clouddirectory \
+    cloudformation \
+    cloudfront \
+    cloudhsm \
+    cloudhsmv2 \
+    cloudsearch \
+    cloudsearchdomain \
+    cloudtrail \
+    cloudwatch \
+    codebuild \
+    codecommit \
+    codepipeline \
+    codestar \
+    cognito-identity \
+    cognito-idp \
+    cognito-sync \
+    comprehend \
+    comprehendmedical \
+    configservice \
+    configure \
+    connect \
+    cur \
+    datapipeline \
+    datasync \
+    dax \
+    deploy \
+    devicefarm \
+    directconnect \
+    discovery \
+    dlm \
+    dms \
+    docdb \
+    ds \
+    dynamodb \
+    dynamodbstreams \
+    ec2 \
+    ecr \
+    ecs \
+    efs \
+    eks \
+    elasticache \
+    elasticbeanstalk \
+    elastictranscoder \
+    elb \
+    elbv2 \
+    emr \
+    es \
+    events \
+    firehose \
+    fms \
+    fsx \
+    gamelift \
+    glacier \
+    globalaccelerator \
+    glue \
+    greengrass \
+    guardduty \
+    health \
+    help \
+    history \
+    iam \
+    importexport \
+    inspector \
+    iot \
+    iot-data \
+    iot-jobs-data \
+    iot1click-devices \
+    iot1click-projects \
+    iotanalytics \
+    kafka \
+    kinesis \
+    kinesis-video-archived-media \
+    kinesis-video-media \
+    kinesisanalytics \
+    kinesisanalyticsv2 \
+    kinesisvideo \
+    kms \
+    lambda \
+    lex-models \
+    lex-runtime \
+    license-manager \
+    lightsail \
+    logs \
+    machinelearning \
+    macie \
+    marketplace-entitlement \
+    marketplacecommerceanalytics \
+    mediaconnect \
+    mediaconvert \
+    medialive \
+    mediapackage \
+    mediastore \
+    mediastore-data \
+    mediatailor \
+    meteringmarketplace \
+    mgh \
+    mobile \
+    mq \
+    mturk \
+    neptune \
+    opsworks \
+    opsworks-cm \
+    organizations \
+    pi \
+    pinpoint \
+    pinpoint-email \
+    pinpoint-sms-voice \
+    polly \
+    pricing \
+    quicksight \
+    ram \
+    rds \
+    rds-data \
+    redshift \
+    rekognition \
+    resource-groups \
+    resourcegroupstaggingapi \
+    robomaker \
+    route53 \
+    route53domains \
+    route53resolver \
+    s3 \
+    s3api \
+    s3control \
+    sagemaker \
+    sagemaker-runtime \
+    sdb \
+    secretsmanager \
+    securityhub \
+    serverlessrepo \
+    servicecatalog \
+    servicediscovery \
+    ses \
+    shield \
+    signer \
+    sms \
+    snowball \
+    sns \
+    sqs \
+    ssm \
+    stepfunctions \
+    storagegateway \
+    sts \
+    support \
+    swf \
+    textract \
+    transcribe \
+    transfer \
+    translate \
+    waf \
+    waf-regional \
+    workdocs \
+    worklink \
+    workmail \
+    workspaces \
+    xray
 
 complete -c aws -n '__fish_is_first_arg' -xa "$aws_services"
diff --git a/share/completions/bd.fish b/share/completions/bd.fish
index 3e3805938..fb9444ab0 100644
--- a/share/completions/bd.fish
+++ b/share/completions/bd.fish
@@ -7,9 +7,9 @@
 
 complete -c bd -A -f
 
-complete -c bd -s c    -d "Classic mode: goes back to the first directory named as the string"
-complete -c bd -s s    -d "Seems mode: goes back to the first directory containing string"
-complete -c bd -s i    -d "Case insensitive move (implies seems mode)"
+complete -c bd -s c -d "Classic mode: goes back to the first directory named as the string"
+complete -c bd -s s -d "Seems mode: goes back to the first directory containing string"
+complete -c bd -s i -d "Case insensitive move (implies seems mode)"
 complete -c bd -s h -x -d "Display help and exit"
 
 function __fish_bd_complete_dirs
diff --git a/share/completions/bosh.fish b/share/completions/bosh.fish
index a2bda6b79..a3b771162 100644
--- a/share/completions/bosh.fish
+++ b/share/completions/bosh.fish
@@ -1,92 +1,92 @@
 set -l subcommands add-blob alias-env attach-disk blobs cancel-task clean-up \
-  cloud-check cloud-config config configs cpi-config create-env create-release \
-  delete-config delete-deployment delete-disk delete-env delete-release \
-  delete-snapshot delete-snapshots delete-stemcell delete-vm deploy deployment \
-  deployments diff-config disks environment environments errands event events \
-  export-release finalize-release generate-job generate-package help ignore \
-  init-release inspect-release instances interpolate locks log-in log-out logs \
-  manifest orphan-disk recreate releases remove-blob repack-stemcell \
-  reset-release restart run-errand runtime-config scp snapshots ssh start \
-  stemcells stop sync-blobs take-snapshot task tasks unignore \
-  update-cloud-config update-config update-cpi-config update-resurrection \
-  update-runtime-config upload-blobs upload-release upload-stemcell variables \
-  vendor-package vms
+    cloud-check cloud-config config configs cpi-config create-env create-release \
+    delete-config delete-deployment delete-disk delete-env delete-release \
+    delete-snapshot delete-snapshots delete-stemcell delete-vm deploy deployment \
+    deployments diff-config disks environment environments errands event events \
+    export-release finalize-release generate-job generate-package help ignore \
+    init-release inspect-release instances interpolate locks log-in log-out logs \
+    manifest orphan-disk recreate releases remove-blob repack-stemcell \
+    reset-release restart run-errand runtime-config scp snapshots ssh start \
+    stemcells stop sync-blobs take-snapshot task tasks unignore \
+    update-cloud-config update-config update-cpi-config update-resurrection \
+    update-runtime-config upload-blobs upload-release upload-stemcell variables \
+    vendor-package vms
 
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'add-blob'               --description "Add blob"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'alias-env'              --description "Alias environment to save URL and CA certificate"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'attach-disk'            --description "Attaches disk to an instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'blobs'                  --description "List blobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cancel-task'            --description "Cancel task at its next checkpoint"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'clean-up'               --description "Clean up releases, stemcells, disks, etc."
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-check'            --description "Cloud consistency check and interactive repair"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-config'           --description "Show current cloud config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'config'                 --description "Show current config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'configs'                --description "List configs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cpi-config'             --description "Show current CPI config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-env'             --description "Create or update BOSH environment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-release'         --description "Create release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-config'          --description "Delete config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-deployment'      --description "Delete deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-disk'            --description "Delete disk"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-env'             --description "Delete BOSH environment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-release'         --description "Delete release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshot'        --description "Delete snapshot"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshots'       --description "Delete all snapshots in a deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-stemcell'        --description "Delete stemcell"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-vm'              --description "Delete VM"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deploy'                 --description "Update deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployment'             --description "Show deployment information"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployments'            --description "List deployments"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'diff-config'            --description "Diff two configs by ID"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'disks'                  --description "List disks"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environment'            --description "Show environment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environments'           --description "List environments"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'errands'                --description "List errands"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'event'                  --description "Show event details"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'events'                 --description "List events"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'export-release'         --description "Export the compiled release to a tarball"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'finalize-release'       --description "Create final release from dev release tarball"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-job'           --description "Generate job"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-package'       --description "Generate package"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'help'                   --description "Show this help message"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ignore'                 --description "Ignore an instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'init-release'           --description "Initialize release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'inspect-release'        --description "List release contents such as jobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'instances'              --description "List all instances in a deployment"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'interpolate'            --description "Interpolates variables into a manifest"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'locks'                  --description "List current locks"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-in'                 --description "Log in"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-out'                --description "Log out"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'logs'                   --description "Fetch logs from instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'manifest'               --description "Show deployment manifest"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'orphan-disk'            --description "Orphan disk"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'recreate'               --description "Recreate instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'releases'               --description "List releases"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'remove-blob'            --description "Remove blob"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'repack-stemcell'        --description "Repack stemcell"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'reset-release'          --description "Reset release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'restart'                --description "Restart instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'run-errand'             --description "Run errand"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'runtime-config'         --description "Show current runtime config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'scp'                    --description "SCP to/from instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'snapshots'              --description "List snapshots"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ssh'                    --description "SSH into instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'start'                  --description "Start instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stemcells'              --description "List stemcells"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stop'                   --description "Stop instance(s)"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'sync-blobs'             --description "Sync blobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'take-snapshot'          --description "Take snapshot"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'task'                   --description "Show task status and start tracking its output"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'tasks'                  --description "List running or recent tasks"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'unignore'               --description "Unignore an instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cloud-config'    --description "Update current cloud config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-config'          --description "Update config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cpi-config'      --description "Update current CPI config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-resurrection'    --description "Enable/disable resurrection"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-runtime-config'  --description "Update current runtime config"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-blobs'           --description "Upload blobs"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-release'         --description "Upload release"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-stemcell'        --description "Upload stemcell"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'variables'              --description "List variables"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vendor-package'         --description "Vendor package"
-complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vms'                    --description "List all VMs in all deployments"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'add-blob' --description "Add blob"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'alias-env' --description "Alias environment to save URL and CA certificate"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'attach-disk' --description "Attaches disk to an instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'blobs' --description "List blobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cancel-task' --description "Cancel task at its next checkpoint"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'clean-up' --description "Clean up releases, stemcells, disks, etc."
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-check' --description "Cloud consistency check and interactive repair"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cloud-config' --description "Show current cloud config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'config' --description "Show current config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'configs' --description "List configs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'cpi-config' --description "Show current CPI config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-env' --description "Create or update BOSH environment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'create-release' --description "Create release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-config' --description "Delete config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-deployment' --description "Delete deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-disk' --description "Delete disk"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-env' --description "Delete BOSH environment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-release' --description "Delete release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshot' --description "Delete snapshot"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-snapshots' --description "Delete all snapshots in a deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-stemcell' --description "Delete stemcell"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'delete-vm' --description "Delete VM"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deploy' --description "Update deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployment' --description "Show deployment information"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'deployments' --description "List deployments"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'diff-config' --description "Diff two configs by ID"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'disks' --description "List disks"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environment' --description "Show environment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'environments' --description "List environments"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'errands' --description "List errands"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'event' --description "Show event details"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'events' --description "List events"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'export-release' --description "Export the compiled release to a tarball"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'finalize-release' --description "Create final release from dev release tarball"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-job' --description "Generate job"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'generate-package' --description "Generate package"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'help' --description "Show this help message"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ignore' --description "Ignore an instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'init-release' --description "Initialize release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'inspect-release' --description "List release contents such as jobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'instances' --description "List all instances in a deployment"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'interpolate' --description "Interpolates variables into a manifest"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'locks' --description "List current locks"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-in' --description "Log in"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'log-out' --description "Log out"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'logs' --description "Fetch logs from instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'manifest' --description "Show deployment manifest"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'orphan-disk' --description "Orphan disk"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'recreate' --description "Recreate instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'releases' --description "List releases"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'remove-blob' --description "Remove blob"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'repack-stemcell' --description "Repack stemcell"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'reset-release' --description "Reset release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'restart' --description "Restart instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'run-errand' --description "Run errand"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'runtime-config' --description "Show current runtime config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'scp' --description "SCP to/from instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'snapshots' --description "List snapshots"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'ssh' --description "SSH into instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'start' --description "Start instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stemcells' --description "List stemcells"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'stop' --description "Stop instance(s)"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'sync-blobs' --description "Sync blobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'take-snapshot' --description "Take snapshot"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'task' --description "Show task status and start tracking its output"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'tasks' --description "List running or recent tasks"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'unignore' --description "Unignore an instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cloud-config' --description "Update current cloud config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-config' --description "Update config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-cpi-config' --description "Update current CPI config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-resurrection' --description "Enable/disable resurrection"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'update-runtime-config' --description "Update current runtime config"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-blobs' --description "Upload blobs"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-release' --description "Upload release"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'upload-stemcell' --description "Upload stemcell"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'variables' --description "List variables"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vendor-package' --description "Vendor package"
+complete -f -n "__fish_use_subcommand $subcommands" -c bosh -a 'vms' --description "List all VMs in all deployments"
diff --git a/share/completions/bower.fish b/share/completions/bower.fish
index e459a5c23..d61f657e1 100644
--- a/share/completions/bower.fish
+++ b/share/completions/bower.fish
@@ -1,5 +1,5 @@
 function __bower_cmds
-	echo -en "cache\tManage bower cache
+    echo -en "cache\tManage bower cache
 help\tDisplay help information about Bower
 home\tOpens a package homepage into your favorite browser
 info\tInfo of a particular package
@@ -20,7 +20,7 @@ version\tBump a package version
 end
 
 function __bower_args
-	echo -en "-f\tMakes various commands more forceful
+    echo -en "-f\tMakes various commands more forceful
 --force\tMakes various commands more forceful
 -j\tOutput consumable JSON
 --json\tOutput consumable JSON
@@ -41,14 +41,14 @@ function __bower_args
 end
 
 function __bower_matching_pkgs
-	bower search (commandline -ct) | string match -r "\S+[^\s]" | string match -v "Search"
+    bower search (commandline -ct) | string match -r "\S+[^\s]" | string match -v "Search"
 end
 
 # Output of `bower list` is a) slow, b) convoluted. Use `python` or `jq` instead.
 function __bower_list_installed
-	if not test -e bower.json
-		return 1
-	end
+    if not test -e bower.json
+        return 1
+    end
 
     if set -l python (__fish_anypython)
         $python -c 'import json, sys; data = json.load(sys.stdin);
@@ -56,11 +56,11 @@ for k,v in data["dependencies"].items(): print(k + "\t" + v[:18])' bower.json 2>
         return
     end
 
-	if not type -q jq
-		return 1
-	end
+    if not type -q jq
+        return 1
+    end
 
-	jq -r '.dependencies | to_entries[] | .key' bower.json
+    jq -r '.dependencies | to_entries[] | .key' bower.json
 end
 
 complete -c bower -n "__fish_is_first_token" -x -a '(__bower_cmds)'
diff --git a/share/completions/brew.fish b/share/completions/brew.fish
index e3930c41b..ad07d93f8 100644
--- a/share/completions/brew.fish
+++ b/share/completions/brew.fish
@@ -1,34 +1,34 @@
 function __fish_brew_get_cmd
-  for c in (commandline -opc)
-    if not string match -q -- '-*' $c
-      echo $c
+    for c in (commandline -opc)
+        if not string match -q -- '-*' $c
+            echo $c
+        end
     end
-  end
 end
 
 function __fish_brew_needs_command
-  set cmd (__fish_brew_get_cmd)
-  if not set -q cmd[2]
-    return 0
-  end
-  return 1
+    set cmd (__fish_brew_get_cmd)
+    if not set -q cmd[2]
+        return 0
+    end
+    return 1
 end
 
 function __fish_brew_using_command
-  set index 2
+    set index 2
 
-  if set -q argv[2]
-    set index $argv[2]
-  end
-
-  set cmd (__fish_brew_get_cmd)
-
-  if set -q cmd[$index]
-    if [ $argv[1] = $cmd[$index] ]
-      return 0
+    if set -q argv[2]
+        set index $argv[2]
     end
-  end
-  return 1
+
+    set cmd (__fish_brew_get_cmd)
+
+    if set -q cmd[$index]
+        if [ $argv[1] = $cmd[$index] ]
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_brew_formulae
@@ -74,32 +74,32 @@ end
 ########
 
 function __fish_brew_is_subcommand_cask
-  if __fish_brew_using_command cask
-    for action in $argv
-      if __fish_brew_using_command $action 3
-        return 0
-      end
+    if __fish_brew_using_command cask
+        for action in $argv
+            if __fish_brew_using_command $action 3
+                return 0
+            end
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_brew_needs_cask_action
-  if __fish_brew_using_command cask
-    set cmd (__fish_brew_get_cmd)
-    if not set -q cmd[3]
-      return 0
+    if __fish_brew_using_command cask
+        set cmd (__fish_brew_get_cmd)
+        if not set -q cmd[3]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_brew_casks
-  brew search --casks
+    brew search --casks
 end
 
 function __fish_brew_casks_installed
-  brew cask list
+    brew cask list
 end
 
 
@@ -108,28 +108,28 @@ end
 ############
 
 function __fish_brew_is_subcommand_services
-  if __fish_brew_using_command services
-    for action in $argv
-      if __fish_brew_using_command $action 3
-        return 0
-      end
+    if __fish_brew_using_command services
+        for action in $argv
+            if __fish_brew_using_command $action 3
+                return 0
+            end
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_brew_needs_services_action
-  if __fish_brew_using_command services
-    set cmd (__fish_brew_get_cmd)
-    if not set -q cmd[3]
-      return 0
+    if __fish_brew_using_command services
+        set cmd (__fish_brew_get_cmd)
+        if not set -q cmd[3]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_brew_services
-  brew services list | awk '{if (NR>1) print $1}'
+    brew services list | awk '{if (NR>1) print $1}'
 end
 
 
diff --git a/share/completions/bundle.fish b/share/completions/bundle.fish
index 7223a8127..5c3451cd6 100644
--- a/share/completions/bundle.fish
+++ b/share/completions/bundle.fish
@@ -1,25 +1,25 @@
 # Completion for bundler
 
 function __fish_bundle_no_command -d 'Test if bundle has been given no subcommand'
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 function __fish_bundle_using_command -d 'Test if bundle has been given a specific subcommand'
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_bundled_gems
-  bundle list | sed '1 d' | sed -e 's/\*//g' -e 's/(.*)//g' -e 's/^ *//g' -e 's/ *$//g'
+    bundle list | sed '1 d' | sed -e 's/\*//g' -e 's/(.*)//g' -e 's/^ *//g' -e 's/ *$//g'
 end
 
 # Options for all commands
@@ -56,7 +56,7 @@ complete -f -n '__fish_bundle_using_command install' -c bundle -l no-prune -d 'D
 complete -f -n '__fish_bundle_using_command install' -c bundle -l frozen -d 'Do not allow the Gemfile.lock to be updated after this install'
 
 # Update
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'update'  -d 'Update dependencies to their latest versions'
+complete -f -n '__fish_bundle_no_command' -c bundle -a 'update' -d 'Update dependencies to their latest versions'
 complete -f -n '__fish_bundle_using_command update' -c bundle -l source -d 'The name of a :git or :path source used in the Gemfile'
 complete -f -n '__fish_bundle_using_command update' -c bundle -l local -d 'Do not attempt to fetch gems remotely and use the gem cache instead'
 complete -f -n '__fish_bundle_using_command update' -c bundle -l quiet -d 'Only output warnings and errors'
@@ -75,7 +75,7 @@ complete -f -n '__fish_bundle_using_command binstubs' -c bundle -l force -d 'Ove
 complete -f -n '__fish_bundle_using_command binstubs' -c bundle -a '(__fish_bundled_gems)'
 
 # Exec
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'exec' -d 'Execute a script in the context of the current bundle'
+complete -f -n '__fish_bundle_no_command' -c bundle -a exec -d 'Execute a script in the context of the current bundle'
 complete -f -n '__fish_bundle_using_command exec' -c bundle -l keep-file-descriptors -d 'Exec runs a command, providing it access to the gems in the bundle'
 
 # Help
@@ -83,7 +83,7 @@ complete -f -n '__fish_bundle_no_command' -c bundle -a 'help' -d 'Describe avail
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'install' -d 'Install the gems specified by the Gemfile or Gemfile.lock'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'update' -d 'Update dependencies to their latest versions'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'package' -d 'Package .gem files into the vendor/cache directory'
-complete -f -n '__fish_bundle_using_command help' -c bundle -a 'exec' -d 'Execute a script in the context of the current bundle'
+complete -f -n '__fish_bundle_using_command help' -c bundle -a exec -d 'Execute a script in the context of the current bundle'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'config' -d 'Specify and read configuration options for bundler'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'check' -d 'Check bundler requirements for your application'
 complete -f -n '__fish_bundle_using_command help' -c bundle -a 'list' -d 'Show all of the gems in the current bundle'
@@ -145,7 +145,7 @@ complete -f -n '__fish_bundle_using_command init' -c bundle -l gemspec -d 'Use a
 
 # Gem
 complete -f -n '__fish_bundle_no_command' -c bundle -a 'gem' -d 'Create a simple gem, suitable for development with bundler'
-complete -f -n '__fish_bundle_using_command gem' -c bundle -s b -l bin  -d 'Generate a binary for your library'
+complete -f -n '__fish_bundle_using_command gem' -c bundle -s b -l bin -d 'Generate a binary for your library'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -s t -l test -d 'Generate a test directory for your library (rspec or minitest)'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -s e -l edit -d 'Path to your editor'
 complete -f -n '__fish_bundle_using_command gem' -c bundle -l ext -d 'Generate the boilerplate for C extension code'
@@ -155,7 +155,7 @@ complete -f -n '__fish_bundle_no_command' -c bundle -a 'platform' -d 'Displays p
 complete -f -n '__fish_bundle_using_command platform' -c bundle -l ruby -d 'Only display Ruby directive information'
 
 # Clean
-complete -f -n '__fish_bundle_no_command' -c bundle -a 'clean'    -d 'Cleans up unused gems in your bundler directory'
+complete -f -n '__fish_bundle_no_command' -c bundle -a 'clean' -d 'Cleans up unused gems in your bundler directory'
 complete -f -n '__fish_bundle_using_command clean' -c bundle -l dry-run -d 'Only print out changes, do not actually clean gems'
 complete -f -n '__fish_bundle_using_command clean' -c bundle -l force -d 'Forces clean even if --path is not set'
 
diff --git a/share/completions/busctl.fish b/share/completions/busctl.fish
index 6358d37e5..29d3d2bc6 100644
--- a/share/completions/busctl.fish
+++ b/share/completions/busctl.fish
@@ -7,22 +7,22 @@
 
 # A simple wrapper to call busctl with the correct mode and output
 function __fish_busctl
-	# TODO: If there's a "--address" argument we need to pass that
-	# We also need to pass the _last_ of these (`busctl --user --system` operates on the system bus)
-	set -l mode
+    # TODO: If there's a "--address" argument we need to pass that
+    # We also need to pass the _last_ of these (`busctl --user --system` operates on the system bus)
+    set -l mode
     if __fish_contains_opt user
-		set mode "--user"
-	else
-		set mode "--system"
-	end
+        set mode "--user"
+    else
+        set mode "--system"
+    end
     command busctl $mode $argv --no-legend --no-pager 2>/dev/null
 end
 
 function _fish_busctl
     set -l args a-address= s-show-machine u-unique A-acquired ä-activatable \
-    m-match= S-size= l-list q-quiet v-verbose e-expect-reply= Ä-auto-start= \
-    1-allow-interactive-authorization= t-timeout= 2-augment-creds= U-user 3-system \
-    H/host= M/machine= n-no-pager N-no-legend h/help V-version
+        m-match= S-size= l-list q-quiet v-verbose e-expect-reply= Ä-auto-start= \
+        1-allow-interactive-authorization= t-timeout= 2-augment-creds= U-user 3-system \
+        H/host= M/machine= n-no-pager N-no-legend h/help V-version
     set -l cmdline (commandline -opc) (commandline -ct)
     set -e cmdline[1]
     argparse $args -- $cmdline 2>/dev/null
@@ -91,27 +91,29 @@ function _fish_busctl
 end
 
 function __fish_busctl_busnames
-	__fish_busctl list --acquired | string replace -r '\s+.*$' ''
-	# Describe unique names (":1.32") with their process (e.g. `:1.32\tsteam`)
-	__fish_busctl list --unique | string replace -r '\s+\S+\s+(\S+)\s+.*$' '\t$1'
+    __fish_busctl list --acquired | string replace -r '\s+.*$' ''
+    # Describe unique names (":1.32") with their process (e.g. `:1.32\tsteam`)
+    __fish_busctl list --unique | string replace -r '\s+\S+\s+(\S+)\s+.*$' '\t$1'
 end
 
 function __fish_busctl_objects -a busname
-	__fish_busctl tree --list $busname | string replace -r '\s+.*$' ''
+    __fish_busctl tree --list $busname | string replace -r '\s+.*$' ''
 end
 
 function __fish_busctl_interfaces -a busname -a object
-	__fish_busctl introspect --list $busname $object | string replace -r '\s+.*$' ''
+    __fish_busctl introspect --list $busname $object | string replace -r '\s+.*$' ''
 end
 
 function __fish_busctl_members -a type -a busname -a object -a interface
-	__fish_busctl introspect --list $busname $object $interface \
-	| string match -- "* $type *" | string replace -r '.(\S+) .*' '$1'
+    __fish_busctl introspect --list $busname $object $interface \
+        | string match -- "* $type *" | string replace -r '.(\S+) .*' '$1'
 end
 
 function __fish_busctl_signature -a busname -a object -a interface -a member
-	__fish_busctl introspect --list $busname $object $interface \
-	| string match ".$member *" | while read a b c d; echo $c; end
+    __fish_busctl introspect --list $busname $object $interface \
+        | string match ".$member *" | while read a b c d
+        echo $c
+    end
 end
 
 ### Commands
diff --git a/share/completions/cabal.fish b/share/completions/cabal.fish
index 02eecd5f8..ba3908841 100644
--- a/share/completions/cabal.fish
+++ b/share/completions/cabal.fish
@@ -1,12 +1,12 @@
 function __fish_complete_cabal
-        if type -q -f cabal
-                set cmd (commandline -poc)
-                if test (count $cmd) -gt 1
-                        cabal $cmd[2..-1] --list-options
-                else
-                        cabal --list-options
-                end
+    if type -q -f cabal
+        set cmd (commandline -poc)
+        if test (count $cmd) -gt 1
+            cabal $cmd[2..-1] --list-options
+        else
+            cabal --list-options
         end
+    end
 end
 
 complete -c cabal -a '(__fish_complete_cabal)'
diff --git a/share/completions/caddy.fish b/share/completions/caddy.fish
index 6281a67f5..da185b59b 100644
--- a/share/completions/caddy.fish
+++ b/share/completions/caddy.fish
@@ -1,27 +1,27 @@
 # Caddy is a general-purpose HTTP/2 web server that serves HTTPS by default.
 # https://caddyserver.com
 
-complete -c caddy    -o agree                     -d "Agree to the CA's Subscriber Agreement"
-complete -c caddy -x -o ca                        -d "URL to certificate authority's ACME server directory"
-complete -c caddy -x -o catimeout                 -d "Default ACME CA HTTP timeout"
-complete -c caddy -r -o conf -a stdin             -d "Caddyfile to load"
-complete -c caddy -x -o cpu                       -d "CPU cap"
-complete -c caddy    -o disable-http-challenge    -d "Disable the ACME HTTP challenge"
-complete -c caddy    -o disable-tls-sni-challenge -d "Disable the ACME TLS-SNI challenge"
-complete -c caddy -x -o email                     -d "Default ACME CA account email address"
-complete -c caddy -x -o grace                     -d "Maximum duration of graceful shutdown"
-complete -c caddy -x -o host                      -d "Default host"
-complete -c caddy -x -o http-port                 -d "Default port to use for HTTP"
-complete -c caddy    -o http2                     -d "Use HTTP/2"
-complete -c caddy -x -o https-port                -d "Default port to use for HTTPS"
-complete -c caddy -r -o log                       -d "Process log file"
-complete -c caddy -r -o pidfile                   -d "Path to write pid file"
-complete -c caddy    -o plugins                   -d "List installed plugins"
-complete -c caddy -x -o port                      -d "Default port"
-complete -c caddy    -o quic                      -d "Use experimental QUIC"
-complete -c caddy    -o quiet                     -d "Quiet mode (no initialization output)"
-complete -c caddy -x -o revoke                    -d "Hostname for which to revoke the certificate"
-complete -c caddy -r -o root                      -d "Root path of default site"
-complete -c caddy -x -o type                      -d "Type of server to run"
-complete -c caddy    -o validate                  -d "Parse the Caddyfile but do not start the server"
-complete -c caddy    -o version                   -d "Show version"
+complete -c caddy -o agree -d "Agree to the CA's Subscriber Agreement"
+complete -c caddy -x -o ca -d "URL to certificate authority's ACME server directory"
+complete -c caddy -x -o catimeout -d "Default ACME CA HTTP timeout"
+complete -c caddy -r -o conf -a stdin -d "Caddyfile to load"
+complete -c caddy -x -o cpu -d "CPU cap"
+complete -c caddy -o disable-http-challenge -d "Disable the ACME HTTP challenge"
+complete -c caddy -o disable-tls-sni-challenge -d "Disable the ACME TLS-SNI challenge"
+complete -c caddy -x -o email -d "Default ACME CA account email address"
+complete -c caddy -x -o grace -d "Maximum duration of graceful shutdown"
+complete -c caddy -x -o host -d "Default host"
+complete -c caddy -x -o http-port -d "Default port to use for HTTP"
+complete -c caddy -o http2 -d "Use HTTP/2"
+complete -c caddy -x -o https-port -d "Default port to use for HTTPS"
+complete -c caddy -r -o log -d "Process log file"
+complete -c caddy -r -o pidfile -d "Path to write pid file"
+complete -c caddy -o plugins -d "List installed plugins"
+complete -c caddy -x -o port -d "Default port"
+complete -c caddy -o quic -d "Use experimental QUIC"
+complete -c caddy -o quiet -d "Quiet mode (no initialization output)"
+complete -c caddy -x -o revoke -d "Hostname for which to revoke the certificate"
+complete -c caddy -r -o root -d "Root path of default site"
+complete -c caddy -x -o type -d "Type of server to run"
+complete -c caddy -o validate -d "Parse the Caddyfile but do not start the server"
+complete -c caddy -o version -d "Show version"
diff --git a/share/completions/canto.fish b/share/completions/canto.fish
index 7c487fb75..23f01f78f 100644
--- a/share/completions/canto.fish
+++ b/share/completions/canto.fish
@@ -1,17 +1,17 @@
 
 function __fish_canto_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
+        if [ count $argv -gt 2 ]
+            if [ $argv[2] = $cmd[2] ]
+                return 0
+            end
+        end
     end
-    if [ count $argv -gt 2 ]
-      if [ $argv[2] = $cmd[2] ]
-        return 0
-      end
-    end
-  end
-  return 1
+    return 1
 end
 
 
diff --git a/share/completions/cargo.fish b/share/completions/cargo.fish
index fbea632be..fa224265d 100644
--- a/share/completions/cargo.fish
+++ b/share/completions/cargo.fish
@@ -13,43 +13,43 @@ complete -c cargo -f -c cargo -n '__fish_use_subcommand' -a '$__fish_cargo_subco
 complete -c cargo -x -c cargo -n '__fish_seen_subcommand_from help' -a '$__fish_cargo_subcommands'
 
 for x in bench build clean doc fetch generate-lockfile \
-		locate-project package pkgid publish \
-		read-manifest run rustc test update \
-		verify-project;
-	complete -c cargo -r -n "__fish_seen_subcommand_from $x" -l manifest-path -d 'path to the manifest to compile'
+    locate-project package pkgid publish \
+    read-manifest run rustc test update \
+    verify-project
+    complete -c cargo -r -n "__fish_seen_subcommand_from $x" -l manifest-path -d 'path to the manifest to compile'
 end
 
-for x in bench build clean doc rustc test update;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -s p -l spec -d 'Package to build'
+for x in bench build clean doc rustc test update
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -s p -l spec -d 'Package to build'
 end
 
-for x in bench build clean doc run rustc test;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l target -d 'Build for the target triple'
+for x in bench build clean doc run rustc test
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l target -d 'Build for the target triple'
 end
 
-for x in bench build rustc test;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bench -d 'Only the specified benchmark'
-	complete -c cargo -n "__fish_seen_subcommand_from $x" -l lib -d 'Only this package\'s library'
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l test -d 'Only the specified test'
+for x in bench build rustc test
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bench -d 'Only the specified benchmark'
+    complete -c cargo -n "__fish_seen_subcommand_from $x" -l lib -d 'Only this package\'s library'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l test -d 'Only the specified test'
 end
 
-for x in bench build run rustc test;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bin -d 'Only the specified binary'
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l example -d 'Only the specified example'
+for x in bench build run rustc test
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l bin -d 'Only the specified binary'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l example -d 'Only the specified example'
 end
 
-for x in build run rustc test;
-	complete -c cargo -n "__fish_seen_subcommand_from $x" -l release -d 'Build artifacts in release mode, with optimizations'
+for x in build run rustc test
+    complete -c cargo -n "__fish_seen_subcommand_from $x" -l release -d 'Build artifacts in release mode, with optimizations'
 end
 
-for x in bench test;
-	complete -c cargo -n "__fish_seen_subcommand_from $x" -l no-run -d 'Compile but do not run'
+for x in bench test
+    complete -c cargo -n "__fish_seen_subcommand_from $x" -l no-run -d 'Compile but do not run'
 end
 
-for x in bench build doc run rustc test;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -s j -l jobs -d  'Number of jobs to run in parallel'
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l features -d 'Space-separated list of features to also build'
-	complete -c cargo -n "__fish_seen_subcommand_from $x" -l no-default-features -d 'Do not build the `default` feature'
+for x in bench build doc run rustc test
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -s j -l jobs -d 'Number of jobs to run in parallel'
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l features -d 'Space-separated list of features to also build'
+    complete -c cargo -n "__fish_seen_subcommand_from $x" -l no-default-features -d 'Do not build the `default` feature'
 end
 
 complete -c cargo -n '__fish_seen_subcommand_from doc' -l no-deps -d 'Don\'t build documentation for dependencies'
@@ -63,21 +63,21 @@ complete -c cargo -n '__fish_seen_subcommand_from new' -l bin
 complete -c cargo -x -n '__fish_seen_subcommand_from git-checkout' -l url
 complete -c cargo -x -n '__fish_seen_subcommand_from git-checkout' -l reference
 
-for x in login publish search;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l host -d 'The host to submit the request to'
+for x in login publish search
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l host -d 'The host to submit the request to'
 end
 
 complete -c cargo -n '__fish_seen_subcommand_from doc' -l open -d 'Opens the docs in a browser after the operation'
 
 complete -c cargo -r -n '__fish_seen_subcommand_from owner' -s a -l add -d 'Login of a user to add as an owner'
-complete -c cargo -r -n '__fish_seen_subcommand_from owner' -s r -l remove  -d 'Login of a user to remove as an owner'
+complete -c cargo -r -n '__fish_seen_subcommand_from owner' -s r -l remove -d 'Login of a user to remove as an owner'
 
-for x in owner yank;
-	complete -c cargo -r -n "__fish_seen_subcommand_from $x" -l index -d 'Registry index to use'
+for x in owner yank
+    complete -c cargo -r -n "__fish_seen_subcommand_from $x" -l index -d 'Registry index to use'
 end
 
-for x in owner publish yank;
-	complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l token -d 'API token to use when authenticating'
+for x in owner publish yank
+    complete -c cargo -x -n "__fish_seen_subcommand_from $x" -l token -d 'API token to use when authenticating'
 end
 
 complete -c cargo -n '__fish_seen_subcommand_from package' -l no-verify -d 'Don\'t verify the contents by building them'
diff --git a/share/completions/cat.fish b/share/completions/cat.fish
index 8e9bf016d..b7cc526c5 100644
--- a/share/completions/cat.fish
+++ b/share/completions/cat.fish
@@ -1,21 +1,21 @@
-if cat --version 2>/dev/null > /dev/null # GNU
-	complete -c cat -s A -l show-all -d "Escape all unprintables"
-	complete -c cat -s b -l number-nonblank -d "Number non-blank lines"
-	complete -c cat -s e -d "Escape unprintables except \\t"
-	complete -c cat -s E -l show-ends -d "Display \$ at line end"
-	complete -c cat -s n -l number -d "Enumerate lines"
-	complete -c cat -s s -l squeeze-blank -d "Never >1 blank line"
-	complete -c cat -s t -d "Escape unprintables except \\n"
-	complete -c cat -s T -l show-tabs -d "Escape tab"
-	complete -c cat -s v -d "Escape unprintables except '\\n' and \\t"
-	complete -c cat -l help -d "Display help and exit"
-	complete -c cat -l version -d "Display version and exit"
+if cat --version 2>/dev/null >/dev/null # GNU
+    complete -c cat -s A -l show-all -d "Escape all unprintables"
+    complete -c cat -s b -l number-nonblank -d "Number non-blank lines"
+    complete -c cat -s e -d "Escape unprintables except \\t"
+    complete -c cat -s E -l show-ends -d "Display \$ at line end"
+    complete -c cat -s n -l number -d "Enumerate lines"
+    complete -c cat -s s -l squeeze-blank -d "Never >1 blank line"
+    complete -c cat -s t -d "Escape unprintables except \\n"
+    complete -c cat -s T -l show-tabs -d "Escape tab"
+    complete -c cat -s v -d "Escape unprintables except '\\n' and \\t"
+    complete -c cat -l help -d "Display help and exit"
+    complete -c cat -l version -d "Display version and exit"
 else # OS X
-	complete -c cat -s b -d "Specify # of non-blank lines"
-	complete -c cat -s e -d "Show unprintables, end lines with \$"
-	complete -c cat -s n -d "Enumerate lines"
-	complete -c cat -s s -d "Squeeze away >1 blank lines"
-	complete -c cat -s t -d "Show unprintables; tab as '^I'"
-	complete -c cat -s u -d "Disable output buffering"
-	complete -c cat -s v -d "Escape non-printing chars"
+    complete -c cat -s b -d "Specify # of non-blank lines"
+    complete -c cat -s e -d "Show unprintables, end lines with \$"
+    complete -c cat -s n -d "Enumerate lines"
+    complete -c cat -s s -d "Squeeze away >1 blank lines"
+    complete -c cat -s t -d "Show unprintables; tab as '^I'"
+    complete -c cat -s u -d "Disable output buffering"
+    complete -c cat -s v -d "Escape non-printing chars"
 end
\ No newline at end of file
diff --git a/share/completions/cf.fish b/share/completions/cf.fish
index ac1a7080c..5b1bebb23 100644
--- a/share/completions/cf.fish
+++ b/share/completions/cf.fish
@@ -1,208 +1,208 @@
 set -l subcommands help version login logout passwd target api auth apps app \
-  push scale delete rename start stop restart restage restart-app-instance \
-  run-task tasks terminate-task events files logs env set-env unset-env stacks \
-  stack copy-source create-app-manifest get-health-check set-health-check \
-  enable-ssh disable-ssh ssh-enabled ssh marketplace services service \
-  create-service update-service delete-service rename-service \
-  create-service-key service-keys service-key delete-service-key bind-service \
-  unbind-service bind-route-service unbind-route-service \
-  create-user-provided-service update-user-provided-service orgs org \
-  create-org delete-org rename-org spaces space create-space delete-space \
-  rename-space allow-space-ssh disallow-space-ssh space-ssh-allowed domains \
-  create-domain delete-domain create-shared-domain delete-shared-domain \
-  router-groups routes create-route check-route map-route unmap-route \
-  delete-route delete-orphaned-routes network-policies add-network-policy \
-  remove-network-policy buildpacks create-buildpack update-buildpack \
-  rename-buildpack delete-buildpack create-user delete-user org-users \
-  set-org-role unset-org-role space-users set-space-role unset-space-role \
-  quotas quota set-quota create-quota delete-quota update-quota \
-  share-private-domain unshare-private-domain space-quotas space-quota \
-  create-space-quota update-space-quota delete-space-quota set-space-quota \
-  unset-space-quota service-auth-tokens create-service-auth-token \
-  update-service-auth-token delete-service-auth-token service-brokers \
-  create-service-broker update-service-broker delete-service-broker \
-  rename-service-broker migrate-service-instances purge-service-offering \
-  purge-service-instance service-access enable-service-access \
-  disable-service-access security-group security-groups create-security-group \
-  update-security-group delete-security-group bind-security-group \
-  unbind-security-group bind-staging-security-group staging-security-groups \
-  unbind-staging-security-group bind-running-security-group \
-  running-security-groups unbind-running-security-group \
-  running-environment-variable-group staging-environment-variable-group \
-  set-staging-environment-variable-group set-running-environment-variable-group \
-  isolation-segments create-isolation-segment delete-isolation-segment \
-  enable-org-isolation disable-org-isolation set-org-default-isolation-segment \
-  reset-org-default-isolation-segment set-space-isolation-segment \
-  reset-space-isolation-segment feature-flags feature-flag enable-feature-flag \
-  disable-feature-flag curl config oauth-token ssh-code add-plugin-repo \
-  remove-plugin-repo list-plugin-repos repo-plugins plugins install-plugin \
-  uninstall-plugin
+    push scale delete rename start stop restart restage restart-app-instance \
+    run-task tasks terminate-task events files logs env set-env unset-env stacks \
+    stack copy-source create-app-manifest get-health-check set-health-check \
+    enable-ssh disable-ssh ssh-enabled ssh marketplace services service \
+    create-service update-service delete-service rename-service \
+    create-service-key service-keys service-key delete-service-key bind-service \
+    unbind-service bind-route-service unbind-route-service \
+    create-user-provided-service update-user-provided-service orgs org \
+    create-org delete-org rename-org spaces space create-space delete-space \
+    rename-space allow-space-ssh disallow-space-ssh space-ssh-allowed domains \
+    create-domain delete-domain create-shared-domain delete-shared-domain \
+    router-groups routes create-route check-route map-route unmap-route \
+    delete-route delete-orphaned-routes network-policies add-network-policy \
+    remove-network-policy buildpacks create-buildpack update-buildpack \
+    rename-buildpack delete-buildpack create-user delete-user org-users \
+    set-org-role unset-org-role space-users set-space-role unset-space-role \
+    quotas quota set-quota create-quota delete-quota update-quota \
+    share-private-domain unshare-private-domain space-quotas space-quota \
+    create-space-quota update-space-quota delete-space-quota set-space-quota \
+    unset-space-quota service-auth-tokens create-service-auth-token \
+    update-service-auth-token delete-service-auth-token service-brokers \
+    create-service-broker update-service-broker delete-service-broker \
+    rename-service-broker migrate-service-instances purge-service-offering \
+    purge-service-instance service-access enable-service-access \
+    disable-service-access security-group security-groups create-security-group \
+    update-security-group delete-security-group bind-security-group \
+    unbind-security-group bind-staging-security-group staging-security-groups \
+    unbind-staging-security-group bind-running-security-group \
+    running-security-groups unbind-running-security-group \
+    running-environment-variable-group staging-environment-variable-group \
+    set-staging-environment-variable-group set-running-environment-variable-group \
+    isolation-segments create-isolation-segment delete-isolation-segment \
+    enable-org-isolation disable-org-isolation set-org-default-isolation-segment \
+    reset-org-default-isolation-segment set-space-isolation-segment \
+    reset-space-isolation-segment feature-flags feature-flag enable-feature-flag \
+    disable-feature-flag curl config oauth-token ssh-code add-plugin-repo \
+    remove-plugin-repo list-plugin-repos repo-plugins plugins install-plugin \
+    uninstall-plugin
 
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'help'                                   --description "Show help"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'version'                                --description "Print the version"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'login'                                  --description "Log user in"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logout'                                 --description "Log user out"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'passwd'                                 --description "Change user password"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'target'                                 --description "Set or view the targeted org or space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'api'                                    --description "Set or view target api url"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'auth'                                   --description "Authenticate user non-interactively"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'apps'                                   --description "List all apps in the target space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'app'                                    --description "Display health and status for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'push'                                   --description "Push a new app or sync changes to an existing app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'scale'                                  --description "Change or view the instance count, disk space limit, and memory limit for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete'                                 --description "Delete an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename'                                 --description "Rename an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'start'                                  --description "Start an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stop'                                   --description "Stop an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart'                                --description "Stop all instances of the app, then start them again. This causes downtime."
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restage'                                --description "Recreate the app's executable artifact using the latest pushed app files and the latest environment (variables, service bindings, buildpack, stack, etc.)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart-app-instance'                   --description "Terminate, then restart an app instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'run-task'                               --description "Run a one-off task on an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'tasks'                                  --description "List tasks of an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'terminate-task'                         --description "Terminate a running task of an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'events'                                 --description "Show recent app events"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'files'                                  --description "Print out a list of files in a directory or the contents of a specific file of an app running on the DEA backend"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logs'                                   --description "Tail or show recent logs for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'env'                                    --description "Show all env variables for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-env'                                --description "Set an env variable for an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-env'                              --description "Remove an env variable"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stacks'                                 --description "List all stacks (a stack is a pre-built file system, including an operating system, that can run apps)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stack'                                  --description "Show information for a stack (a stack is a pre-built file system, including an operating system, that can run apps)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'copy-source'                            --description "Copies the source code of an application to another existing application (and restarts that application)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-app-manifest'                    --description "Create an app manifest for an app that has been pushed successfully"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'get-health-check'                       --description "Show the type of health check performed on an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-health-check'                       --description "Change type of health check performed on an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-ssh'                             --description "Enable ssh for the application"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-ssh'                            --description "Disable ssh for the application"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-enabled'                            --description "Reports whether SSH is enabled on an application container instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh'                                    --description "SSH to an application container instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'marketplace'                            --description "List available offerings in the marketplace"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'services'                               --description "List all service instances in the target space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service'                                --description "Show service instance info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service'                         --description "Create a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service'                         --description "Update a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service'                         --description "Delete a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service'                         --description "Rename a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-key'                     --description "Create key for a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-keys'                           --description "List keys for a service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-key'                            --description "Show service key info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-key'                     --description "Delete a service key"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-service'                           --description "Bind a service instance to an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-service'                         --description "Unbind a service instance from an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-route-service'                     --description "Bind a service instance to an HTTP route"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-route-service'                   --description "Unbind a service instance from an HTTP route"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user-provided-service'           --description "Make a user-provided service instance available to CF apps"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-user-provided-service'           --description "Update user-provided service instance"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'orgs'                                   --description "List all orgs"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org'                                    --description "Show org info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-org'                             --description "Create an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-org'                             --description "Delete an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-org'                             --description "Rename an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'spaces'                                 --description "List all spaces in an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space'                                  --description "Show space info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space'                           --description "Create a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space'                           --description "Delete a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-space'                           --description "Rename a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'allow-space-ssh'                        --description "Allow SSH access for the space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disallow-space-ssh'                     --description "Disallow SSH access for the space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-ssh-allowed'                      --description "Reports whether SSH is allowed in a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'domains'                                --description "List domains in the target org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-domain'                          --description "Create a domain in an org for later use"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-domain'                          --description "Delete a domain"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-shared-domain'                   --description "Create a domain that can be used by all orgs (admin-only)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-shared-domain'                   --description "Delete a shared domain"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'router-groups'                          --description "List router groups"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'routes'                                 --description "List all routes in the current space or the current organization"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-route'                           --description "Create a url route in a space for later use"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'check-route'                            --description "Perform a simple check to determine whether a route currently exists or not"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'map-route'                              --description "Add a url route to an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unmap-route'                            --description "Remove a url route from an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-route'                           --description "Delete a route"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-orphaned-routes'                 --description "Delete all orphaned routes (i.e. those that are not mapped to an app)"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'network-policies'                       --description "List direct network traffic policies"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-network-policy'                     --description "Create policy to allow direct network traffic from one app to another"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-network-policy'                  --description "Remove network traffic policy of an app"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'buildpacks'                             --description "List all buildpacks"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-buildpack'                       --description "Create a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-buildpack'                       --description "Update a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-buildpack'                       --description "Rename a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-buildpack'                       --description "Delete a buildpack"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user'                            --description "Create a new user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-user'                            --description "Delete a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org-users'                              --description "Show org users by role"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-role'                           --description "Assign an org role to a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-org-role'                         --description "Remove an org role from a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-users'                            --description "Show space users by role"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-role'                         --description "Assign a space role to a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-role'                       --description "Remove a space role from a user"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quotas'                                 --description "List available usage quotas"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quota'                                  --description "Show quota info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-quota'                              --description "Assign a quota to an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-quota'                           --description "Define a new resource quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-quota'                           --description "Delete a quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-quota'                           --description "Update an existing resource quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'share-private-domain'                   --description "Share a private domain with an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unshare-private-domain'                 --description "Unshare a private domain with an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quotas'                           --description "List available space resource quotas"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quota'                            --description "Show space quota info"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space-quota'                     --description "Define a new space resource quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-space-quota'                     --description "Update an existing space quota"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space-quota'                     --description "Delete a space quota definition and unassign the space quota from all spaces"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-quota'                        --description "Assign a space quota definition to a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-quota'                      --description "Unassign a quota from a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-auth-tokens'                    --description "List service auth tokens"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-auth-token'              --description "Create a service auth token"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-auth-token'              --description "Update a service auth token"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-auth-token'              --description "Delete a service auth token"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-brokers'                        --description "List service brokers"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-broker'                  --description "Create a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-broker'                  --description "Update a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-broker'                  --description "Delete a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service-broker'                  --description "Rename a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'migrate-service-instances'              --description "Migrate service instances from one service plan to another"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-offering'                 --description "Recursively remove a service and child objects from Cloud Foundry database without making requests to a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-instance'                 --description "Recursively remove a service instance and child objects from Cloud Foundry database without making requests to a service broker"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-access'                         --description "List service access settings"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-service-access'                  --description "Enable access to a service or service plan for one or all orgs"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-service-access'                 --description "Disable access to a service or service plan for one or all orgs"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-group'                         --description "Show a single security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-groups'                        --description "List all security groups"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-security-group'                  --description "Create a security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-security-group'                  --description "Update a security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-security-group'                  --description "Deletes a security group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-security-group'                    --description "Bind a security group to a particular space, or all existing spaces of an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-security-group'                  --description "Unbind a security group from a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-staging-security-group'            --description "Bind a security group to the list of security groups to be used for staging applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-security-groups'                --description "List security groups in the staging set for applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-staging-security-group'          --description "Unbind a security group from the set of security groups for staging applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-running-security-group'            --description "Bind a security group to the list of security groups to be used for running applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-security-groups'                --description "List security groups in the set of security groups for running applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-running-security-group'          --description "Unbind a security group from the set of security groups for running applications"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-environment-variable-group'     --description "Retrieve the contents of the running environment variable group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-environment-variable-group'     --description "Retrieve the contents of the staging environment variable group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'help' --description "Show help"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'version' --description "Print the version"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'login' --description "Log user in"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logout' --description "Log user out"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'passwd' --description "Change user password"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'target' --description "Set or view the targeted org or space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'api' --description "Set or view target api url"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'auth' --description "Authenticate user non-interactively"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'apps' --description "List all apps in the target space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'app' --description "Display health and status for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'push' --description "Push a new app or sync changes to an existing app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'scale' --description "Change or view the instance count, disk space limit, and memory limit for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete' --description "Delete an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename' --description "Rename an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'start' --description "Start an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stop' --description "Stop an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart' --description "Stop all instances of the app, then start them again. This causes downtime."
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restage' --description "Recreate the app's executable artifact using the latest pushed app files and the latest environment (variables, service bindings, buildpack, stack, etc.)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'restart-app-instance' --description "Terminate, then restart an app instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'run-task' --description "Run a one-off task on an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'tasks' --description "List tasks of an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'terminate-task' --description "Terminate a running task of an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'events' --description "Show recent app events"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'files' --description "Print out a list of files in a directory or the contents of a specific file of an app running on the DEA backend"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'logs' --description "Tail or show recent logs for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'env' --description "Show all env variables for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-env' --description "Set an env variable for an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-env' --description "Remove an env variable"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stacks' --description "List all stacks (a stack is a pre-built file system, including an operating system, that can run apps)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'stack' --description "Show information for a stack (a stack is a pre-built file system, including an operating system, that can run apps)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'copy-source' --description "Copies the source code of an application to another existing application (and restarts that application)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-app-manifest' --description "Create an app manifest for an app that has been pushed successfully"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'get-health-check' --description "Show the type of health check performed on an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-health-check' --description "Change type of health check performed on an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-ssh' --description "Enable ssh for the application"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-ssh' --description "Disable ssh for the application"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-enabled' --description "Reports whether SSH is enabled on an application container instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh' --description "SSH to an application container instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'marketplace' --description "List available offerings in the marketplace"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'services' --description "List all service instances in the target space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service' --description "Show service instance info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service' --description "Create a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service' --description "Update a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service' --description "Delete a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service' --description "Rename a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-key' --description "Create key for a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-keys' --description "List keys for a service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-key' --description "Show service key info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-key' --description "Delete a service key"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-service' --description "Bind a service instance to an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-service' --description "Unbind a service instance from an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-route-service' --description "Bind a service instance to an HTTP route"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-route-service' --description "Unbind a service instance from an HTTP route"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user-provided-service' --description "Make a user-provided service instance available to CF apps"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-user-provided-service' --description "Update user-provided service instance"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'orgs' --description "List all orgs"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org' --description "Show org info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-org' --description "Create an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-org' --description "Delete an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-org' --description "Rename an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'spaces' --description "List all spaces in an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space' --description "Show space info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space' --description "Create a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space' --description "Delete a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-space' --description "Rename a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'allow-space-ssh' --description "Allow SSH access for the space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disallow-space-ssh' --description "Disallow SSH access for the space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-ssh-allowed' --description "Reports whether SSH is allowed in a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'domains' --description "List domains in the target org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-domain' --description "Create a domain in an org for later use"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-domain' --description "Delete a domain"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-shared-domain' --description "Create a domain that can be used by all orgs (admin-only)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-shared-domain' --description "Delete a shared domain"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'router-groups' --description "List router groups"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'routes' --description "List all routes in the current space or the current organization"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-route' --description "Create a url route in a space for later use"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'check-route' --description "Perform a simple check to determine whether a route currently exists or not"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'map-route' --description "Add a url route to an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unmap-route' --description "Remove a url route from an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-route' --description "Delete a route"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-orphaned-routes' --description "Delete all orphaned routes (i.e. those that are not mapped to an app)"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'network-policies' --description "List direct network traffic policies"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-network-policy' --description "Create policy to allow direct network traffic from one app to another"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-network-policy' --description "Remove network traffic policy of an app"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'buildpacks' --description "List all buildpacks"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-buildpack' --description "Create a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-buildpack' --description "Update a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-buildpack' --description "Rename a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-buildpack' --description "Delete a buildpack"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-user' --description "Create a new user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-user' --description "Delete a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'org-users' --description "Show org users by role"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-role' --description "Assign an org role to a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-org-role' --description "Remove an org role from a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-users' --description "Show space users by role"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-role' --description "Assign a space role to a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-role' --description "Remove a space role from a user"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quotas' --description "List available usage quotas"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'quota' --description "Show quota info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-quota' --description "Assign a quota to an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-quota' --description "Define a new resource quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-quota' --description "Delete a quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-quota' --description "Update an existing resource quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'share-private-domain' --description "Share a private domain with an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unshare-private-domain' --description "Unshare a private domain with an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quotas' --description "List available space resource quotas"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'space-quota' --description "Show space quota info"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-space-quota' --description "Define a new space resource quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-space-quota' --description "Update an existing space quota"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-space-quota' --description "Delete a space quota definition and unassign the space quota from all spaces"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-quota' --description "Assign a space quota definition to a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unset-space-quota' --description "Unassign a quota from a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-auth-tokens' --description "List service auth tokens"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-auth-token' --description "Create a service auth token"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-auth-token' --description "Update a service auth token"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-auth-token' --description "Delete a service auth token"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-brokers' --description "List service brokers"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-service-broker' --description "Create a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-service-broker' --description "Update a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-service-broker' --description "Delete a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'rename-service-broker' --description "Rename a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'migrate-service-instances' --description "Migrate service instances from one service plan to another"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-offering' --description "Recursively remove a service and child objects from Cloud Foundry database without making requests to a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'purge-service-instance' --description "Recursively remove a service instance and child objects from Cloud Foundry database without making requests to a service broker"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'service-access' --description "List service access settings"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-service-access' --description "Enable access to a service or service plan for one or all orgs"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-service-access' --description "Disable access to a service or service plan for one or all orgs"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-group' --description "Show a single security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'security-groups' --description "List all security groups"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-security-group' --description "Create a security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'update-security-group' --description "Update a security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-security-group' --description "Deletes a security group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-security-group' --description "Bind a security group to a particular space, or all existing spaces of an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-security-group' --description "Unbind a security group from a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-staging-security-group' --description "Bind a security group to the list of security groups to be used for staging applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-security-groups' --description "List security groups in the staging set for applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-staging-security-group' --description "Unbind a security group from the set of security groups for staging applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'bind-running-security-group' --description "Bind a security group to the list of security groups to be used for running applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-security-groups' --description "List security groups in the set of security groups for running applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'unbind-running-security-group' --description "Unbind a security group from the set of security groups for running applications"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'running-environment-variable-group' --description "Retrieve the contents of the running environment variable group"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'staging-environment-variable-group' --description "Retrieve the contents of the staging environment variable group"
 complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-staging-environment-variable-group' --description "Pass parameters as JSON to create a staging environment variable group"
 complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-running-environment-variable-group' --description "Pass parameters as JSON to create a running environment variable group"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'isolation-segments'                     --description "List all isolation segments"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-isolation-segment'               --description "Create an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-isolation-segment'               --description "Delete an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-org-isolation'                   --description "Entitle an organization to an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-org-isolation'                  --description "Revoke an organization's entitlement to an isolation segment"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-default-isolation-segment'      --description "Set the default isolation segment used for apps in spaces in an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-org-default-isolation-segment'    --description "Reset the default isolation segment used for apps in spaces of an org"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-isolation-segment'            --description "Assign the isolation segment for a space"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-space-isolation-segment'          --description "Reset the space's isolation segment to the org default"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flags'                          --description "Retrieve list of feature flags with status"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flag'                           --description "Retrieve an individual feature flag with status"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-feature-flag'                    --description "Allow use of a feature"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-feature-flag'                   --description "Prevent use of a feature"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'curl'                                   --description "Executes a request to the targeted API endpoint"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'config'                                 --description "Write default values to the config"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'oauth-token'                            --description "Retrieve and display the OAuth token for the current session"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-code'                               --description "Get a one time password for ssh clients"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-plugin-repo'                        --description "Add a new plugin repository"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-plugin-repo'                     --description "Remove a plugin repository"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'list-plugin-repos'                      --description "List all the added plugin repositories"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'repo-plugins'                           --description "List all available plugins in specified repository or in all added repositories"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'plugins'                                --description "List commands of installed plugins"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'install-plugin'                         --description "Install CLI plugin"
-complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'uninstall-plugin'                       --description "Uninstall CLI plugin"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'isolation-segments' --description "List all isolation segments"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'create-isolation-segment' --description "Create an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'delete-isolation-segment' --description "Delete an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-org-isolation' --description "Entitle an organization to an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-org-isolation' --description "Revoke an organization's entitlement to an isolation segment"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-org-default-isolation-segment' --description "Set the default isolation segment used for apps in spaces in an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-org-default-isolation-segment' --description "Reset the default isolation segment used for apps in spaces of an org"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'set-space-isolation-segment' --description "Assign the isolation segment for a space"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'reset-space-isolation-segment' --description "Reset the space's isolation segment to the org default"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flags' --description "Retrieve list of feature flags with status"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'feature-flag' --description "Retrieve an individual feature flag with status"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'enable-feature-flag' --description "Allow use of a feature"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'disable-feature-flag' --description "Prevent use of a feature"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'curl' --description "Executes a request to the targeted API endpoint"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'config' --description "Write default values to the config"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'oauth-token' --description "Retrieve and display the OAuth token for the current session"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'ssh-code' --description "Get a one time password for ssh clients"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'add-plugin-repo' --description "Add a new plugin repository"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'remove-plugin-repo' --description "Remove a plugin repository"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'list-plugin-repos' --description "List all the added plugin repositories"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'repo-plugins' --description "List all available plugins in specified repository or in all added repositories"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'plugins' --description "List commands of installed plugins"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'install-plugin' --description "Install CLI plugin"
+complete -f -n "__fish_use_subcommand $subcommands" -c cf -a 'uninstall-plugin' --description "Uninstall CLI plugin"
diff --git a/share/completions/clang++.fish b/share/completions/clang++.fish
index 7b7087c3a..783ddf7a1 100644
--- a/share/completions/clang++.fish
+++ b/share/completions/clang++.fish
@@ -4,4 +4,4 @@
 
 complete -p '*clang++*' -n '__fish_should_complete_switches' -xa '(__fish_clang_complete)'
 complete -p '*clang++*' -n 'not __fish_should_complete_switches' \
-	-xa '(__fish_complete_suffix \'{.o,.out,.c,.cpp,.so,.dylib}\')'
+    -xa '(__fish_complete_suffix \'{.o,.out,.c,.cpp,.so,.dylib}\')'
diff --git a/share/completions/clang.fish b/share/completions/clang.fish
index b7879550e..020454f3a 100644
--- a/share/completions/clang.fish
+++ b/share/completions/clang.fish
@@ -5,7 +5,7 @@
 # This pattern unfortunately matches clang-format, etc. as well.
 complete -p '*clang*' -n '__fish_should_complete_switches' -xa '(__fish_clang_complete)'
 complete -c 'clang' -n 'not __fish_should_complete_switches' \
-	-xa "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
+    -xa "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
 # again but without the -x this time for the pattern-matched completion
 complete -p '*clang*' -n 'not __fish_should_complete_switches' \
-	-a "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
+    -a "(__fish_complete_suffix '{.o,.out,.c,.cpp,.so,.dylib}')"
diff --git a/share/completions/commandline.fish b/share/completions/commandline.fish
index f60f9b774..1a7e7953e 100644
--- a/share/completions/commandline.fish
+++ b/share/completions/commandline.fish
@@ -4,8 +4,8 @@ complete -c commandline -s a -l append -d "Add text to the end of the selected a
 complete -c commandline -s i -l insert -d "Add text at cursor"
 complete -c commandline -s r -l replace -d "Replace selected part"
 
-complete -c commandline -s j -l current-job  -d "Select job under cursor"
-complete -c commandline -s p -l current-process  -d "Select process under cursor"
+complete -c commandline -s j -l current-job -d "Select job under cursor"
+complete -c commandline -s p -l current-process -d "Select process under cursor"
 complete -c commandline -s t -l current-token -d "Select token under cursor"
 complete -c commandline -s b -l current-buffer -d "Select entire command line (default)"
 
diff --git a/share/completions/compare.fish b/share/completions/compare.fish
index 117691143..4b87f43bd 100644
--- a/share/completions/compare.fish
+++ b/share/completions/compare.fish
@@ -1,45 +1,45 @@
-complete -c compare -o alpha                       -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(compare -list alpha)'
-complete -c compare -o authenticate                -d 'Decipher image with this password [password]'
-complete -c compare -o channel                     -d 'Apply option to select image channels [type]' -xa '(compare -list channel)'
-complete -c compare -o colorspace                  -d 'Alternate image colorspace [type]' -xa '(compare -list colorspace)'
-complete -c compare -o compose                     -d 'Set image composite operator [operator]'
-complete -c compare -o compress                    -d 'Type of pixel compression when writing the image [type]' -xa '(compare -list compress)'
-complete -c compare -o decipher                    -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c compare -o define                      -d 'Define one or more image format options [format:option]'
-complete -c compare -o density                     -d 'Horizontal and vertical density of the image [geometry]'
-complete -c compare -o depth                       -d 'Image depth [value]'
-complete -c compare -o dissimilarity-threshold     -d 'Maximum distortion for (sub)image match [value]'
-complete -c compare -o encipher                    -d 'Convert plain pixels to cipher pixels [filename]' -r
-complete -c compare -o extract                     -d 'Extract area from image [geometry]'
-complete -c compare -o format                      -d 'Output formatted image characteristics ["string"]'
-complete -c compare -o fuzz                        -d 'Colors within this distance are considered equal [distance]'
-complete -c compare -o highlight-color             -d 'Emphasize pixel differences with this color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c compare -o identify                    -d 'Identify the format and characteristics of the image'
-complete -c compare -o interlace                   -d 'Type of image interlacing scheme [type]' -xa '(compare -list interlace)'
-complete -c compare -o limit                       -d 'Pixel cache resource limit [type value]' -x
-complete -c compare -o lowlight-color              -d 'De-emphasize pixel differences with this color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c compare -o metric                      -d 'Measure differences between images with this metric [type]' -xa '(compare -list metric)'
-complete -c compare -o monitor                     -d 'Monitor progress '
-complete -c compare -o passphrase                  -d 'Get the passphrase from this file [filename]' -r
-complete -c compare -o profile                     -d 'Add, delete, or apply an image profile [filename]' -r
-complete -c compare -o quality                     -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c compare -o quiet                       -d 'Suppress all warning messages'
-complete -c compare -o quantize                    -d 'Reduce colors in this colorspace [colorspace]' -xa '(compare -list colorspace)'
-complete -c compare -o regard-warnings             -d 'Pay attention to warning messages'
-complete -c compare -o respect-parentheses         -d 'Settings remain in effect until parenthesis boundary'
-complete -c compare -o sampling-factor             -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c compare -o seed                        -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c compare -o set                         -d 'Attribute set an image attribute [ value]'
-complete -c compare -o size                        -d 'Width and height of image [geometry]'
-complete -c compare -o subimage-search             -d 'Search for subimage'
-complete -c compare -o transparent-color           -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c compare -o type                        -d 'Image type [type]' -xa '(compare -list type)'
-complete -c compare -o verbose                     -d 'Print detailed information about the image'
-complete -c compare -o version                     -d 'Print version information'
-complete -c compare -o virtual-pixel               -d 'Virtual pixel access method [method]' -xa '(compare -list virtual-pixel)'
-complete -c compare -o debug                       -d 'Display copious debugging information [events]' -xa '(compare -list debug)'
-complete -c compare -o help                        -d 'Print program options'
-complete -c compare -o list                        -d 'Print a list of supported option arguments [type]' -xa '(compare -list list)'
-complete -c compare -o log                         -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c compare -o synchronize                 -d 'Synchronize image to storage device'
-complete -c compare -o taint                       -d 'Declare the image as modified'
+complete -c compare -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(compare -list alpha)'
+complete -c compare -o authenticate -d 'Decipher image with this password [password]'
+complete -c compare -o channel -d 'Apply option to select image channels [type]' -xa '(compare -list channel)'
+complete -c compare -o colorspace -d 'Alternate image colorspace [type]' -xa '(compare -list colorspace)'
+complete -c compare -o compose -d 'Set image composite operator [operator]'
+complete -c compare -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(compare -list compress)'
+complete -c compare -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c compare -o define -d 'Define one or more image format options [format:option]'
+complete -c compare -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c compare -o depth -d 'Image depth [value]'
+complete -c compare -o dissimilarity-threshold -d 'Maximum distortion for (sub)image match [value]'
+complete -c compare -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
+complete -c compare -o extract -d 'Extract area from image [geometry]'
+complete -c compare -o format -d 'Output formatted image characteristics ["string"]'
+complete -c compare -o fuzz -d 'Colors within this distance are considered equal [distance]'
+complete -c compare -o highlight-color -d 'Emphasize pixel differences with this color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c compare -o identify -d 'Identify the format and characteristics of the image'
+complete -c compare -o interlace -d 'Type of image interlacing scheme [type]' -xa '(compare -list interlace)'
+complete -c compare -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c compare -o lowlight-color -d 'De-emphasize pixel differences with this color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c compare -o metric -d 'Measure differences between images with this metric [type]' -xa '(compare -list metric)'
+complete -c compare -o monitor -d 'Monitor progress '
+complete -c compare -o passphrase -d 'Get the passphrase from this file [filename]' -r
+complete -c compare -o profile -d 'Add, delete, or apply an image profile [filename]' -r
+complete -c compare -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c compare -o quiet -d 'Suppress all warning messages'
+complete -c compare -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(compare -list colorspace)'
+complete -c compare -o regard-warnings -d 'Pay attention to warning messages'
+complete -c compare -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c compare -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c compare -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c compare -o set -d 'Attribute set an image attribute [ value]'
+complete -c compare -o size -d 'Width and height of image [geometry]'
+complete -c compare -o subimage-search -d 'Search for subimage'
+complete -c compare -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c compare -o type -d 'Image type [type]' -xa '(compare -list type)'
+complete -c compare -o verbose -d 'Print detailed information about the image'
+complete -c compare -o version -d 'Print version information'
+complete -c compare -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(compare -list virtual-pixel)'
+complete -c compare -o debug -d 'Display copious debugging information [events]' -xa '(compare -list debug)'
+complete -c compare -o help -d 'Print program options'
+complete -c compare -o list -d 'Print a list of supported option arguments [type]' -xa '(compare -list list)'
+complete -c compare -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c compare -o synchronize -d 'Synchronize image to storage device'
+complete -c compare -o taint -d 'Declare the image as modified'
diff --git a/share/completions/composer.fish b/share/completions/composer.fish
index 4ae7cb064..93e420040 100644
--- a/share/completions/composer.fish
+++ b/share/completions/composer.fish
@@ -1,23 +1,23 @@
 function __fish_composer_needs_command
-  set cmd (commandline -opc)
+    set cmd (commandline -opc)
 
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
 
-  return 1
+    return 1
 end
 
 function __fish_composer_using_command
-  set cmd (commandline -opc)
+    set cmd (commandline -opc)
 
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
 
-  return 1
+    return 1
 end
 
 function __fish_composer_required_packages
diff --git a/share/completions/composite.fish b/share/completions/composite.fish
index 28de77397..ce972cbae 100644
--- a/share/completions/composite.fish
+++ b/share/completions/composite.fish
@@ -1,85 +1,85 @@
-complete -c composite -o affine                     -d 'Affine transform matrix [matrix]'
-complete -c composite -o alpha                      -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(convert -list alpha)'
-complete -c composite -o authenticate               -d 'Decipher image with this password [password]'
-complete -c composite -o blue-primary               -d 'Chromaticity blue primary point [point]'
-complete -c composite -o channel                    -d 'Apply option to select image channels [type]' -xa '(convert -list channel)'
-complete -c composite -o colorspace                 -d 'Alternate image colorspace [type]' -xa '(convert -list colorspace)'
-complete -c composite -o comment                    -d 'Annotate image with comment [string]'
-complete -c composite -o compose                    -d 'Composite operator [operator]'
-complete -c composite -o compress                   -d 'Type of pixel compression when writing the image [type]' -xa '(convert -list compress)'
-complete -c composite -o define                     -d 'Define one or more image format options [format:option]'
-complete -c composite -o depth                      -d 'Image depth [value]'
-complete -c composite -o density                    -d 'Horizontal and vertical density of the image [geometry]'
-complete -c composite -o display                    -d 'Get image or font from this X server [server]'
-complete -c composite -o dispose                    -d 'Layer disposal method [method]' -xa '(convert -list dispose)'
-complete -c composite -o dither                     -d 'Apply error diffusion to image [method]' -xa '(convert -list dither)'
-complete -c composite -o encoding                   -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c composite -o endian                     -d 'Endianness (MSB or LSB) of the image [type]' -xa '(convert -list endian)'
-complete -c composite -o filter                     -d 'Use this filter when resizing an image [type]' -xa '(convert -list filter)'
-complete -c composite -o font                       -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
-complete -c composite -o format                     -d 'Output formatted image characteristics ["string"]'
-complete -c composite -o gravity                    -d 'Which direction to gravitate towards [type]' -xa '(convert -list gravity)'
-complete -c composite -o green-primary              -d 'Chromaticity green primary point [point]'
-complete -c composite -o interlace                  -d 'Type of image interlacing scheme [type]' -xa '(convert -list interlace)'
-complete -c composite -o interpolate                -d 'Pixel color interpolation method [method]' -xa '(convert -list interpolate)'
-complete -c composite -o label                      -d 'Assign a label to an image [string]'
-complete -c composite -o limit                      -d 'Pixel cache resource limit [type value]' -x
-complete -c composite -o monitor                    -d 'Monitor progress '
-complete -c composite -o page                       -d 'Size and location of an image canvas (setting) [geometry]'
-complete -c composite -o pointsize                  -d 'Font point size [value]'
-complete -c composite -o quality                    -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c composite -o quiet                      -d 'Suppress all warning messages'
-complete -c composite -o red-primary                -d 'Chromaticity red primary point [point]'
-complete -c composite -o regard-warnings            -d 'Pay attention to warning messages'
-complete -c composite -o respect-parentheses        -d 'Settings remain in effect until parenthesis boundary'
-complete -c composite -o sampling-factor            -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c composite -o scene                      -d 'Image scene number [value]'
-complete -c composite -o seed                       -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c composite -o size                       -d 'Width and height of image [geometry]'
-complete -c composite -o synchronize                -d 'Synchronize image to storage device'
-complete -c composite -o taint                      -d 'Declare the image as modified'
-complete -c composite -o transparent-color          -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c composite -o treedepth                  -d 'Color tree depth [value]'
-complete -c composite -o tile                       -d 'Repeat composite operation across and down image'
-complete -c composite -o units                      -d 'The units of image resolution [type]' -xa '(convert -list units)'
-complete -c composite -o verbose                    -d 'Print detailed information about the image'
-complete -c composite -o virtual-pixel              -d 'Virtual pixel access method [method]' -xa '(convert -list virtual-pixel)'
-complete -c composite -o white-point                -d 'Chromaticity white point [point]'
-complete -c composite -o blend                      -d 'Blend images [geometry]'
-complete -c composite -o border                     -d 'Surround image with a border of color [geometry]'
-complete -c composite -o bordercolor                -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c composite -o colors                     -d 'Preferred number of colors in the image [value]'
-complete -c composite -o decipher                   -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c composite -o displace                   -d 'Shift lookup according to a relative displacement map [geometry]'
-complete -c composite -o dissolve                   -d 'Dissolve the two images a given percent [value]'
-complete -c composite -o distort                    -d 'Shift lookup according to a absolute distortion map [geometry]'
-complete -c composite -o encipher                   -d 'Convert plain pixels to cipher pixels [filename]' -r
-complete -c composite -o extract                    -d 'Extract area from image [geometry]'
-complete -c composite -o geometry                   -d 'Location of the composite image [geometry]'
-complete -c composite -o identify                   -d 'Identify the format and characteristics of the image'
-complete -c composite -o monochrome                 -d 'Transform image to black and white'
-complete -c composite -o negate                     -d 'Replace every pixel with its complementary color '
-complete -c composite -o profile                    -d 'Add ICM or IPTC information profile to image [filename]' -r
-complete -c composite -o quantize                   -d 'Reduce colors in this colorspace [colorspace]' -xa '(convert -list colorspace)'
-complete -c composite -o repage                     -d 'Size and location of an image canvas (operator) [geometry]'
-complete -c composite -o rotate                     -d 'Apply Paeth rotation to the image [degrees]'
-complete -c composite -o resize                     -d 'Resize the image [geometry]'
-complete -c composite -o sharpen                    -d 'Sharpen the image [geometry]'
-complete -c composite -o shave                      -d 'Shave pixels from the image edges [geometry]'
-complete -c composite -o stegano                    -d 'Offset hide watermark within an image'
-complete -c composite -o stereo                     -d 'Combine two image to create a stereo anaglyph [geometry]'
-complete -c composite -o strip                      -d 'Strip image of all profiles and comments'
-complete -c composite -o thumbnail                  -d 'Create a thumbnail of the image [geometry]'
-complete -c composite -o transform                  -d 'Affine transform image'
-complete -c composite -o type                       -d 'Image type [type]' -xa '(convert -list type)'
-complete -c composite -o unsharp                    -d 'Sharpen the image [geometry]'
-complete -c composite -o watermark                  -d 'Percent brightness and saturation of a watermark [geometry]'
-complete -c composite -o write                      -d 'Write images to this file [filename]' -r
-complete -c composite -o swap                       -d 'Swap two images in the image sequence [indexes]'
-complete -c composite -o debug                      -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
-complete -c composite -o help                       -d 'Print program options'
-complete -c composite -o list                       -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
-complete -c composite -o log                        -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c composite -o version                    -d 'Print version information'
-complete -c composite -o matte                      -d 'Store matte channel if the image has one'
-complete -c composite -o support                    -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c composite -o affine -d 'Affine transform matrix [matrix]'
+complete -c composite -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(convert -list alpha)'
+complete -c composite -o authenticate -d 'Decipher image with this password [password]'
+complete -c composite -o blue-primary -d 'Chromaticity blue primary point [point]'
+complete -c composite -o channel -d 'Apply option to select image channels [type]' -xa '(convert -list channel)'
+complete -c composite -o colorspace -d 'Alternate image colorspace [type]' -xa '(convert -list colorspace)'
+complete -c composite -o comment -d 'Annotate image with comment [string]'
+complete -c composite -o compose -d 'Composite operator [operator]'
+complete -c composite -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(convert -list compress)'
+complete -c composite -o define -d 'Define one or more image format options [format:option]'
+complete -c composite -o depth -d 'Image depth [value]'
+complete -c composite -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c composite -o display -d 'Get image or font from this X server [server]'
+complete -c composite -o dispose -d 'Layer disposal method [method]' -xa '(convert -list dispose)'
+complete -c composite -o dither -d 'Apply error diffusion to image [method]' -xa '(convert -list dither)'
+complete -c composite -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c composite -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(convert -list endian)'
+complete -c composite -o filter -d 'Use this filter when resizing an image [type]' -xa '(convert -list filter)'
+complete -c composite -o font -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
+complete -c composite -o format -d 'Output formatted image characteristics ["string"]'
+complete -c composite -o gravity -d 'Which direction to gravitate towards [type]' -xa '(convert -list gravity)'
+complete -c composite -o green-primary -d 'Chromaticity green primary point [point]'
+complete -c composite -o interlace -d 'Type of image interlacing scheme [type]' -xa '(convert -list interlace)'
+complete -c composite -o interpolate -d 'Pixel color interpolation method [method]' -xa '(convert -list interpolate)'
+complete -c composite -o label -d 'Assign a label to an image [string]'
+complete -c composite -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c composite -o monitor -d 'Monitor progress '
+complete -c composite -o page -d 'Size and location of an image canvas (setting) [geometry]'
+complete -c composite -o pointsize -d 'Font point size [value]'
+complete -c composite -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c composite -o quiet -d 'Suppress all warning messages'
+complete -c composite -o red-primary -d 'Chromaticity red primary point [point]'
+complete -c composite -o regard-warnings -d 'Pay attention to warning messages'
+complete -c composite -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c composite -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c composite -o scene -d 'Image scene number [value]'
+complete -c composite -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c composite -o size -d 'Width and height of image [geometry]'
+complete -c composite -o synchronize -d 'Synchronize image to storage device'
+complete -c composite -o taint -d 'Declare the image as modified'
+complete -c composite -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c composite -o treedepth -d 'Color tree depth [value]'
+complete -c composite -o tile -d 'Repeat composite operation across and down image'
+complete -c composite -o units -d 'The units of image resolution [type]' -xa '(convert -list units)'
+complete -c composite -o verbose -d 'Print detailed information about the image'
+complete -c composite -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(convert -list virtual-pixel)'
+complete -c composite -o white-point -d 'Chromaticity white point [point]'
+complete -c composite -o blend -d 'Blend images [geometry]'
+complete -c composite -o border -d 'Surround image with a border of color [geometry]'
+complete -c composite -o bordercolor -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c composite -o colors -d 'Preferred number of colors in the image [value]'
+complete -c composite -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c composite -o displace -d 'Shift lookup according to a relative displacement map [geometry]'
+complete -c composite -o dissolve -d 'Dissolve the two images a given percent [value]'
+complete -c composite -o distort -d 'Shift lookup according to a absolute distortion map [geometry]'
+complete -c composite -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
+complete -c composite -o extract -d 'Extract area from image [geometry]'
+complete -c composite -o geometry -d 'Location of the composite image [geometry]'
+complete -c composite -o identify -d 'Identify the format and characteristics of the image'
+complete -c composite -o monochrome -d 'Transform image to black and white'
+complete -c composite -o negate -d 'Replace every pixel with its complementary color '
+complete -c composite -o profile -d 'Add ICM or IPTC information profile to image [filename]' -r
+complete -c composite -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(convert -list colorspace)'
+complete -c composite -o repage -d 'Size and location of an image canvas (operator) [geometry]'
+complete -c composite -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c composite -o resize -d 'Resize the image [geometry]'
+complete -c composite -o sharpen -d 'Sharpen the image [geometry]'
+complete -c composite -o shave -d 'Shave pixels from the image edges [geometry]'
+complete -c composite -o stegano -d 'Offset hide watermark within an image'
+complete -c composite -o stereo -d 'Combine two image to create a stereo anaglyph [geometry]'
+complete -c composite -o strip -d 'Strip image of all profiles and comments'
+complete -c composite -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c composite -o transform -d 'Affine transform image'
+complete -c composite -o type -d 'Image type [type]' -xa '(convert -list type)'
+complete -c composite -o unsharp -d 'Sharpen the image [geometry]'
+complete -c composite -o watermark -d 'Percent brightness and saturation of a watermark [geometry]'
+complete -c composite -o write -d 'Write images to this file [filename]' -r
+complete -c composite -o swap -d 'Swap two images in the image sequence [indexes]'
+complete -c composite -o debug -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
+complete -c composite -o help -d 'Print program options'
+complete -c composite -o list -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
+complete -c composite -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c composite -o version -d 'Print version information'
+complete -c composite -o matte -d 'Store matte channel if the image has one'
+complete -c composite -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
diff --git a/share/completions/conda.fish b/share/completions/conda.fish
index 6a15256ce..88a391485 100644
--- a/share/completions/conda.fish
+++ b/share/completions/conda.fish
@@ -42,23 +42,23 @@ complete -c conda -s h -l help -d "Show help and exit"
 __fish_conda_top -s V -l version -d "Show the conda version number and exit"
 
 # top-level commands
-__fish_conda_top -a clean     -d "Remove unused packages and caches"
-__fish_conda_top -a config    -d "Modify configuration values in .condarc"
-__fish_conda_top -a create    -d "Create a new conda environment from a list of specified packages"
-__fish_conda_top -a help      -d "Displays a list of available conda commands and their help strings"
-__fish_conda_top -a info      -d "Display information about current conda install"
-__fish_conda_top -a install   -d "Installs a list of packages into a specified conda environment"
-__fish_conda_top -a list      -d "List linked packages in a conda environment"
-__fish_conda_top -a package   -d "Low-level conda package utility (EXPERIMENTAL)"
-__fish_conda_top -a remove    -d "Remove a list of packages from a specified conda environment"
+__fish_conda_top -a clean -d "Remove unused packages and caches"
+__fish_conda_top -a config -d "Modify configuration values in .condarc"
+__fish_conda_top -a create -d "Create a new conda environment from a list of specified packages"
+__fish_conda_top -a help -d "Displays a list of available conda commands and their help strings"
+__fish_conda_top -a info -d "Display information about current conda install"
+__fish_conda_top -a install -d "Installs a list of packages into a specified conda environment"
+__fish_conda_top -a list -d "List linked packages in a conda environment"
+__fish_conda_top -a package -d "Low-level conda package utility (EXPERIMENTAL)"
+__fish_conda_top -a remove -d "Remove a list of packages from a specified conda environment"
 __fish_conda_top -a uninstall -d "Alias for conda remove"
-__fish_conda_top -a search    -d "Search for packages and display associated information"
-__fish_conda_top -a update    -d "Updates conda packages to the latest compatible version"
-__fish_conda_top -a upgrade   -d "Alias for conda update"
+__fish_conda_top -a search -d "Search for packages and display associated information"
+__fish_conda_top -a update -d "Updates conda packages to the latest compatible version"
+__fish_conda_top -a upgrade -d "Alias for conda update"
 
 # command added by sourcing ~/miniconda3/etc/fish/conf.d/conda.fish,
 # which is the recommended way to use conda with fish
-__fish_conda_top -a activate   -d "Activate the given environment"
+__fish_conda_top -a activate -d "Activate the given environment"
 __fish_conda activate -x -a "(__fish_conda_environments)"
 __fish_conda_top -a deactivate -d "Deactivate current environment, reactivating the previous one"
 
@@ -66,52 +66,52 @@ __fish_conda_top -a deactivate -d "Deactivate current environment, reactivating
 
 set -l __fish_conda_commands clean config create help info install list package remove uninstall search update upgrade
 for cmd in $__fish_conda_commands
-    __fish_conda $cmd -l json         -d "Report all output as json"
-    __fish_conda $cmd -l debug        -d "Show debug output"
+    __fish_conda $cmd -l json -d "Report all output as json"
+    __fish_conda $cmd -l debug -d "Show debug output"
     __fish_conda $cmd -l verbose -s v -d "Use once for info, twice for debug, three times for trace"
 end
 
 # 'clean' command
-__fish_conda clean -s y -l yes          -d "Do not ask for confirmation"
-__fish_conda clean -l dry-run           -d "Only display what would have been done"
-__fish_conda clean -s q -l quiet        -d "Do not display progress bar"
-__fish_conda clean -s a -l all          -d "Remove all: same as -iltps"
-__fish_conda clean -s i -l index-cache  -d "Remove index cache"
-__fish_conda clean -s l -l lock         -d "Remove all conda lock files"
-__fish_conda clean -s t -l tarballs     -d "Remove cached package tarballs"
-__fish_conda clean -s p -l packages     -d "Remove unused cached packages (no check for symlinks)"
+__fish_conda clean -s y -l yes -d "Do not ask for confirmation"
+__fish_conda clean -l dry-run -d "Only display what would have been done"
+__fish_conda clean -s q -l quiet -d "Do not display progress bar"
+__fish_conda clean -s a -l all -d "Remove all: same as -iltps"
+__fish_conda clean -s i -l index-cache -d "Remove index cache"
+__fish_conda clean -s l -l lock -d "Remove all conda lock files"
+__fish_conda clean -s t -l tarballs -d "Remove cached package tarballs"
+__fish_conda clean -s p -l packages -d "Remove unused cached packages (no check for symlinks)"
 __fish_conda clean -s s -l source-cache -d "Remove files from the source cache of conda build"
 
 # 'config' command
 
-__fish_conda config -l system                                        -d "Write to the system .condarc file"
-__fish_conda config -l env                                           -d "Write to the active conda environment .condarc file"
-__fish_conda config -l file                                          -d "Write to the given file"
-__fish_conda config -l show -x -a "(__fish_conda_config_keys)"       -d "Display configuration values"
-__fish_conda config -l show-sources                                  -d "Display all identified configuration sources"
-__fish_conda config -l validate                                      -d "Validate all configuration sources"
-__fish_conda config -l describe -x -a "(__fish_conda_config_keys)"   -d "Describe configuration parameters"
-__fish_conda config -l write-default                                 -d "Write the default configuration to a file"
-__fish_conda config -l get -x -a "(__fish_conda_config_keys)"        -d "Get a configuration value"
-__fish_conda config -l append                                        -d "Add one configuration value to the end of a list key"
-__fish_conda config -l prepend                                       -d "Add one configuration value to the beginning of a list key"
-__fish_conda config -l add                                           -d "Alias for --prepend"
-__fish_conda config -l set -x -a "(__fish_conda_config_keys)"        -d "Set a boolean or string key"
-__fish_conda config -l remove -x -a "(__fish_conda_config_keys)"     -d "Remove a configuration value from a list key"
+__fish_conda config -l system -d "Write to the system .condarc file"
+__fish_conda config -l env -d "Write to the active conda environment .condarc file"
+__fish_conda config -l file -d "Write to the given file"
+__fish_conda config -l show -x -a "(__fish_conda_config_keys)" -d "Display configuration values"
+__fish_conda config -l show-sources -d "Display all identified configuration sources"
+__fish_conda config -l validate -d "Validate all configuration sources"
+__fish_conda config -l describe -x -a "(__fish_conda_config_keys)" -d "Describe configuration parameters"
+__fish_conda config -l write-default -d "Write the default configuration to a file"
+__fish_conda config -l get -x -a "(__fish_conda_config_keys)" -d "Get a configuration value"
+__fish_conda config -l append -d "Add one configuration value to the end of a list key"
+__fish_conda config -l prepend -d "Add one configuration value to the beginning of a list key"
+__fish_conda config -l add -d "Alias for --prepend"
+__fish_conda config -l set -x -a "(__fish_conda_config_keys)" -d "Set a boolean or string key"
+__fish_conda config -l remove -x -a "(__fish_conda_config_keys)" -d "Remove a configuration value from a list key"
 __fish_conda config -l remove-key -x -a "(__fish_conda_config_keys)" -d "Remove a configuration key (and all its values)"
-__fish_conda config -l stdin                                         -d "Apply configuration given in yaml format from stdin"
+__fish_conda config -l stdin -d "Apply configuration given in yaml format from stdin"
 
 # 'help' command
-__fish_conda "help"         -d "Displays a list of available conda commands and their help strings"
+__fish_conda "help" -d "Displays a list of available conda commands and their help strings"
 __fish_conda "help" -x -a "$__fish_conda_commands"
 
 # 'info' command
-__fish_conda info -l offline         -d "Offline mode, don't connect to the Internet."
-__fish_conda info -s a -l all        -d "Show all information, (environments, license, and system information)"
-__fish_conda info -s e -l envs       -d "List all known conda environments"
-__fish_conda info -s l -l license    -d "Display information about the local conda licenses list"
-__fish_conda info -s s -l system     -d "List environment variables"
-__fish_conda info -l base            -d "Display base environment path"
+__fish_conda info -l offline -d "Offline mode, don't connect to the Internet."
+__fish_conda info -s a -l all -d "Show all information, (environments, license, and system information)"
+__fish_conda info -s e -l envs -d "List all known conda environments"
+__fish_conda info -s l -l license -d "Display information about the local conda licenses list"
+__fish_conda info -s s -l system -d "List environment variables"
+__fish_conda info -l base -d "Display base environment path"
 __fish_conda info -l unsafe-channels -d "Display list of channels with tokens exposed"
 
 # The remaining commands share many options, so the definitions are written the other way around:
diff --git a/share/completions/conjure.fish b/share/completions/conjure.fish
index 8907ad209..46954e08c 100644
--- a/share/completions/conjure.fish
+++ b/share/completions/conjure.fish
@@ -1,9 +1,9 @@
-complete -c conjure -o monitor                      -d 'Monitor progress '
-complete -c conjure -o quiet                        -d 'Suppress all warning messages'
-complete -c conjure -o regard-warnings              -d 'Pay attention to warning messages'
-complete -c conjure -o seed                         -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c conjure -o verbose                      -d 'Print detailed information about the image'
-complete -c conjure -o debug                        -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
-complete -c conjure -o help                         -d 'Print program options'
-complete -c conjure -o log                          -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c conjure -o monitor -d 'Monitor progress '
+complete -c conjure -o quiet -d 'Suppress all warning messages'
+complete -c conjure -o regard-warnings -d 'Pay attention to warning messages'
+complete -c conjure -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c conjure -o verbose -d 'Print detailed information about the image'
+complete -c conjure -o debug -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
+complete -c conjure -o help -d 'Print program options'
+complete -c conjure -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
 #complete -c conjure -o list                         -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
diff --git a/share/completions/convert.fish b/share/completions/convert.fish
index 95e7b5dd5..5e19772af 100644
--- a/share/completions/convert.fish
+++ b/share/completions/convert.fish
@@ -1,232 +1,232 @@
-complete -c convert -o adjoin                                      -d 'Join images into a single multi-image file'
-complete -c convert -o affine                                      -d 'Affine transform matrix [matrix]'
-complete -c convert -o alpha                                       -d 'Activate, deactivate, reset, or set the alpha channel [option]' -xa '(convert -list alpha)'
-complete -c convert -o antialias                                   -d 'Remove pixel-aliasing '
-complete -c convert -o authenticate                                -d 'Decipher image with this password [password]'
-complete -c convert -o attenuate                                   -d 'Lessen (or intensify) when adding noise to an image [value]'
-complete -c convert -o background                                  -d 'Background color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o bias                                        -d 'Add bias when convolving an image [value]'
-complete -c convert -o black-point-compensation                    -d 'Use black point compensation'
-complete -c convert -o blue-primary                                -d 'Chromaticity blue primary point [point]'
-complete -c convert -o bordercolor                                 -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o caption                                     -d 'Assign a caption to an image [string]'
-complete -c convert -o channel                                     -d 'Apply option to select image channels [type]' -xa '(convert -list channel)'
-complete -c convert -o colors                                      -d 'Preferred number of colors in the image [value]'
-complete -c convert -o colorspace                                  -d 'Alternate image colorspace [type]' -xa '(convert -list colorspace)'
-complete -c convert -o comment                                     -d 'Annotate image with comment [string]'
-complete -c convert -o compose                                     -d 'Set image composite operator [operator]'
-complete -c convert -o compress                                    -d 'Type of pixel compression when writing the image [type]' -xa '(convert -list compress)'
-complete -c convert -o define                                      -d 'Define one or more image format options [format:option]'
-complete -c convert -o delay                                       -d 'Display the next image after pausing [value]'
-complete -c convert -o density                                     -d 'Horizontal and vertical density of the image [geometry]'
-complete -c convert -o depth                                       -d 'Image depth [value]'
-complete -c convert -o direction                                   -d 'Render text right-to-left or left-to-right [type]' -xa '(convert -list direction)'
-complete -c convert -o display                                     -d 'Get image or font from this X server [server]'
-complete -c convert -o dispose                                     -d 'Layer disposal method [method]' -xa '(convert -list dispose)'
-complete -c convert -o dither                                      -d 'Apply error diffusion to image [method]' -xa '(convert -list dither)'
-complete -c convert -o encoding                                    -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c convert -o endian                                      -d 'Endianness (MSB or LSB) of the image [type]' -xa '(convert -list endian)'
-complete -c convert -o family                                      -d 'Render text with this font family [name]' -xa '(__fish_complete_convert_options family)'
-complete -c convert -o fill                                        -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o filter                                      -d 'Use this filter when resizing an image [type]' -xa '(convert -list filter)'
-complete -c convert -o font                                        -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
-complete -c convert -o format                                      -d 'Output formatted image characteristics ["string"]'
-complete -c convert -o fuzz                                        -d 'Colors within this distance are considered equal [distance]'
-complete -c convert -o gravity                                     -d 'Horizontal and vertical text placement [type]' -xa '(convert -list gravity)'
-complete -c convert -o green-primary                               -d 'Chromaticity green primary point [point]'
-complete -c convert -o intent                                      -d 'Type of rendering intent when managing the image color [type]' -xa '(convert -list intent)'
-complete -c convert -o interlace                                   -d 'Type of image interlacing scheme [type]' -xa '(convert -list interlace)'
-complete -c convert -o interline-spacing                           -d 'Set the space between two text lines [value]'
-complete -c convert -o interpolate                                 -d 'Pixel color interpolation method [method]' -xa '(convert -list interpolate)'
-complete -c convert -o interword-spacing                           -d 'Set the space between two words [value]'
-complete -c convert -o kerning                                     -d 'Set the space between two letters [value]'
-complete -c convert -o label                                       -d 'Assign a label to an image [string]'
-complete -c convert -o limit                                       -d 'Pixel cache resource limit [type value]' -x
-complete -c convert -o loop                                        -d 'Add Netscape loop extension to your GIF animation [iterations]'
-complete -c convert -o mask                                        -d 'Associate a mask with the image [filename]' -r
-complete -c convert -o mattecolor                                  -d 'Frame color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o monitor                                     -d 'Monitor progress '
-complete -c convert -o orient                                      -d 'Image orientation [type]' -xa '(convert -list orientation)'
-complete -c convert -o page                                        -d 'Size and location of an image canvas (setting) [geometry]'
-complete -c convert -o ping                                        -d 'Efficiently determine image attributes'
-complete -c convert -o pointsize                                   -d 'Font point size [value]'
-complete -c convert -o precision                                   -d 'Maximum number of significant digits to print [value]'
-complete -c convert -o preview                                     -d 'Image preview type [type]' -xa '(convert -list preview)'
-complete -c convert -o quality                                     -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c convert -o quiet                                       -d 'Suppress all warning messages'
-complete -c convert -o red-primary                                 -d 'Chromaticity red primary point [point]'
-complete -c convert -o regard-warnings                             -d 'Pay attention to warning messages'
-complete -c convert -o remap                                       -d 'Transform image colors to match this set of colors [filename]' -r
-complete -c convert -o respect-parentheses                         -d 'Settings remain in effect until parenthesis boundary'
-complete -c convert -o sampling-factor                             -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c convert -o scene                                       -d 'Image scene number [value]'
-complete -c convert -o seed                                        -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c convert -o size                                        -d 'Width and height of image [geometry]'
-complete -c convert -o stretch                                     -d 'Render text with this font stretch [type]' -xa '(convert -list stretch)'
-complete -c convert -o stroke                                      -d 'Graphic primitive stroke color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o strokewidth                                 -d 'Graphic primitive stroke width [value]'
-complete -c convert -o style                                       -d 'Render text with this font style [type]' -xa '(convert -list style)'
-complete -c convert -o synchronize                                 -d 'Synchronize image to storage device'
-complete -c convert -o taint                                       -d 'Declare the image as modified'
-complete -c convert -o texture                                     -d 'Name of texture to tile onto the image background [filename]' -r
-complete -c convert -o tile-offset                                 -d 'Tile offset [geometry]'
-complete -c convert -o treedepth                                   -d 'Color tree depth [value]'
-complete -c convert -o transparent-color                           -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o undercolor                                  -d 'Annotation bounding box color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o units                                       -d 'The units of image resolution [type]' -xa '(convert -list units)'
-complete -c convert -o verbose                                     -d 'Print detailed information about the image'
-complete -c convert -o view                                        -d 'FlashPix viewing transforms'
-complete -c convert -o virtual-pixel                               -d 'Virtual pixel access method [method]' -xa '(convert -list virtual-pixel)'
-complete -c convert -o weight                                      -d 'Render text with this font weight [type]' -x
-complete -c convert -o white-point                                 -d 'Chromaticity white point [point]'
-complete -c convert -o adaptive-blur                               -d 'Adaptively blur pixels; decrease effect near edges [geometry]'
-complete -c convert -o adaptive-resize                             -d 'Adaptively resize image using \'mesh\' interpolation [geometry]'
-complete -c convert -o adaptive-sharpen                            -d 'Adaptively sharpen pixels; increase effect near edges [geometry]'
-complete -c convert -o annotate                                    -d 'Annotate the image with text [geometry text]'
-complete -c convert -o auto-gamma                                  -d 'Automagically adjust gamma level of image'
-complete -c convert -o auto-level                                  -d 'Automagically adjust color levels of image'
-complete -c convert -o auto-orient                                 -d 'Automagically orient (rotate) image'
-complete -c convert -o bench                                       -d 'Measure performance [iterations]'
-complete -c convert -o black-threshold                             -d 'Force all pixels below the threshold into black [value]'
-complete -c convert -o blue-shift                                  -d 'Simulate a scene at nighttime in the moonlight [factor]'
-complete -c convert -o blur                                        -d 'Reduce image noise and reduce detail levels [geometry]'
-complete -c convert -o border                                      -d 'Surround image with a border of color [geometry]'
-complete -c convert -o brightness-contrast                         -d 'Improve brightness / contrast of the image [geometry]'
-complete -c convert -o cdl                                         -d 'Color correct with a color decision list [filename]' -r
-complete -c convert -o charcoal                                    -d 'Simulate a charcoal drawing [radius]'
-complete -c convert -o chop                                        -d 'Remove pixels from the image interior [geometry]'
-complete -c convert -o clamp                                       -d 'Restrict pixel range from 0 to the quantum depth'
-complete -c convert -o clip                                        -d 'Clip along the first path from the 8BIM profile'
-complete -c convert -o clip-mask                                   -d 'Associate a clip mask with the image [filename]' -r
-complete -c convert -o clip-path                                   -d 'Clip along a named path from the 8BIM profile [id]'
-complete -c convert -o colorize                                    -d 'Colorize the image with the fill color [value]'
-complete -c convert -o color-matrix                                -d 'Apply color correction to the image [matrix]'
-complete -c convert -o contrast                                    -d 'Enhance or reduce the image contrast'
-complete -c convert -o contrast-stretch                            -d 'Improve contrast by `stretching\' the intensity range [geometry]'
-complete -c convert -o convolve                                    -d 'Apply a convolution kernel to the image [coefficients]'
-complete -c convert -o cycle                                       -d 'Cycle the image colormap [amount]'
-complete -c convert -o decipher                                    -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c convert -o deskew                                      -d 'Straighten an image [threshold]'
-complete -c convert -o despeckle                                   -d 'Reduce the speckles within an image'
-complete -c convert -o distort                                     -d 'Args distort images according to given method ad args [method]' -xa '(convert -list distort)'
-complete -c convert -o draw                                        -d 'Annotate the image with a graphic primitive [string]'
-complete -c convert -o edge                                        -d 'Apply a filter to detect edges in the image [radius]'
-complete -c convert -o encipher                                    -d 'Convert plain pixels to cipher pixels [filename]' -r
-complete -c convert -o emboss                                      -d 'Emboss an image [radius]'
-complete -c convert -o enhance                                     -d 'Apply a digital filter to enhance a noisy image'
-complete -c convert -o equalize                                    -d 'Perform histogram equalization to an image'
-complete -c convert -o evaluate                                    -d 'Evaluate an arithmetic, relational, or logical expression [operator value]'
-complete -c convert -o extent                                      -d 'Set the image size [geometry]'
-complete -c convert -o extract                                     -d 'Extract area from image [geometry]'
-complete -c convert -o fft                                         -d 'Implements the discrete Fourier transform (DFT)'
-complete -c convert -o flip                                        -d 'Flip image vertically'
-complete -c convert -o floodfill                                   -d 'Color floodfill the image with color [geometry]'
-complete -c convert -o flop                                        -d 'Flop image horizontally'
-complete -c convert -o frame                                       -d 'Surround image with an ornamental border [geometry]'
-complete -c convert -o function                                    -d 'Apply function over image values [name parameters]' -xa '(convert -list function)'
-complete -c convert -o gamma                                       -d 'Level of gamma correction [value]'
-complete -c convert -o gaussian-blur                               -d 'Reduce image noise and reduce detail levels [geometry]'
-complete -c convert -o geometry                                    -d 'Preferred size or location of the image [geometry]'
-complete -c convert -o identify                                    -d 'Identify the format and characteristics of the image'
-complete -c convert -o ift                                         -d 'Implements the inverse discrete Fourier transform (DFT)'
-complete -c convert -o implode                                     -d 'Implode image pixels about the center [amount]'
-complete -c convert -o lat                                         -d 'Local adaptive thresholding [geometry]'
-complete -c convert -o layers                                      -d 'Optimize, merge,  or compare image layers [method]' -xa '(convert -list layers)'
-complete -c convert -o level                                       -d 'Adjust the level of image contrast [value]'
-complete -c convert -o level-colors                                -d 'Level image with the given colors [color,color]' -xa '(__fish_complete_list , "__fish_complete_convert_options color")'
-complete -c convert -o linear-stretch                              -d 'Improve contrast by `stretching with saturation\' [geometry]'
-complete -c convert -o liquid-rescale                              -d 'Rescale image with seam-carving [geometry]'
-complete -c convert -o median                                      -d 'Apply a median filter to the image [geometry]'
-complete -c convert -o mode                                        -d 'Make each pixel the \'predominant color\' of the neighborhood [geometry]'
-complete -c convert -o modulate                                    -d 'Vary the brightness, saturation, and hue [value]'
-complete -c convert -o monochrome                                  -d 'Transform image to black and white'
-complete -c convert -o morphology                                  -d 'Apply a morphology method to the image [method kernel]' -xa '(convert -list morphology)'
-complete -c convert -o motion-blur                                 -d 'Simulate motion blur [geometry]'
-complete -c convert -o negate                                      -d 'Replace every pixel with its complementary color '
-complete -c convert -o noise                                       -d 'Add or reduce noise in an image [geometry]'
-complete -c convert -o normalize                                   -d 'Transform image to span the full range of colors'
-complete -c convert -o opaque                                      -d 'Change this color to the fill color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o ordered-dither                              -d 'Add a noise pattern to the image with specific amplitudes  [NxN]'
-complete -c convert -o paint                                       -d 'Simulate an oil painting [radius]'
-complete -c convert -o polaroid                                    -d 'Simulate a Polaroid picture [angle]'
-complete -c convert -o posterize                                   -d 'Reduce the image to a limited number of color levels [levels]'
-complete -c convert -o profile                                     -d 'Add, delete, or apply an image profile [filename]' -r
-complete -c convert -o quantize                                    -d 'Reduce colors in this colorspace [colorspace]' -xa '(convert -list colorspace)'
-complete -c convert -o radial-blur                                 -d 'Radial blur the image [angle]'
-complete -c convert -o raise                                       -d 'Lighten/darken image edges to create a 3-D effect [value]'
-complete -c convert -o random-threshold                            -d 'Random threshold the image [low,high]'
-complete -c convert -o region                                      -d 'Apply options to a portion of the image [geometry]'
-complete -c convert -o render                                      -d 'Render vector graphics'
-complete -c convert -o repage                                      -d 'Size and location of an image canvas [geometry]'
-complete -c convert -o resample                                    -d 'Change the resolution of an image [geometry]'
-complete -c convert -o resize                                      -d 'Resize the image [geometry]'
-complete -c convert -o roll                                        -d 'Roll an image vertically or horizontally [geometry]'
-complete -c convert -o rotate                                      -d 'Apply Paeth rotation to the image [degrees]'
-complete -c convert -o sample                                      -d 'Scale image with pixel sampling [geometry]'
-complete -c convert -o scale                                       -d 'Scale the image [geometry]'
-complete -c convert -o segment                                     -d 'Segment an image [values]'
-complete -c convert -o selective-blur                              -d 'Selectively blur pixels within a contrast threshold [geometry]'
-complete -c convert -o sepia-tone                                  -d 'Simulate a sepia-toned photo [threshold]'
-complete -c convert -o set                                         -d 'Set an image property [property value]'
-complete -c convert -o shade                                       -d 'Shade the image using a distant light source [degrees]'
-complete -c convert -o shadow                                      -d 'Simulate an image shadow [geometry]'
-complete -c convert -o sharpen                                     -d 'Sharpen the image [geometry]'
-complete -c convert -o shave                                       -d 'Shave pixels from the image edges [geometry]'
-complete -c convert -o shear                                       -d 'Slide one edge of the image along the X or Y axis [geometry]'
-complete -c convert -o sigmoidal-contrast                          -d 'Increase the contrast without saturating highlights or shadows [geometry]'
-complete -c convert -o sketch                                      -d 'Simulate a pencil sketch [geometry]'
-complete -c convert -o solarize                                    -d 'Negate all pixels above the threshold level [threshold]'
-complete -c convert -o sparse-color                                -d 'Args fill in a image based on a few color points [method]' -xa '(convert -list sparse-color)'
-complete -c convert -o splice                                      -d 'Splice the background color into the image [geometry]'
-complete -c convert -o spread                                      -d 'Displace image pixels by a random amount [radius]'
-complete -c convert -o statistic                                   -d 'Replace each pixel with corresponding statistic from the neighborhood [type geometry]' -xa '(convert -list statistic)'
-complete -c convert -o strip                                       -d 'Strip image of all profiles and comments'
-complete -c convert -o swirl                                       -d 'Swirl image pixels about the center [degrees]'
-complete -c convert -o threshold                                   -d 'Threshold the image [value]'
-complete -c convert -o thumbnail                                   -d 'Create a thumbnail of the image [geometry]'
-complete -c convert -o tile                                        -d 'Tile image when filling a graphic primitive [filename]' -r
-complete -c convert -o tint                                        -d 'Tint the image with the fill color [value]'
-complete -c convert -o transform                                   -d 'Affine transform image'
-complete -c convert -o transparent                                 -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
-complete -c convert -o transpose                                   -d 'Flip image vertically and rotate 90 degrees'
-complete -c convert -o transverse                                  -d 'Flop image horizontally and rotate 270 degrees'
-complete -c convert -o trim                                        -d 'Trim image edges'
-complete -c convert -o type                                        -d 'Image type [type]' -xa '(convert -list type)'
-complete -c convert -o unique-colors                               -d 'Discard all but one of any pixel color'
-complete -c convert -o unsharp                                     -d 'Sharpen the image [geometry]'
-complete -c convert -o vignette                                    -d 'Soften the edges of the image in vignette style [geometry]'
-complete -c convert -o wave                                        -d 'Alter an image along a sine wave [geometry]'
-complete -c convert -o white-threshold                             -d 'Force all pixels above the threshold into white [value]'
-complete -c convert -o append                                      -d 'Append an image sequence'
-complete -c convert -o clut                                        -d 'Apply a color lookup table to the image'
-complete -c convert -o coalesce                                    -d 'Merge a sequence of images'
-complete -c convert -o combine                                     -d 'Combine a sequence of images'
-complete -c convert -o composite                                   -d 'Composite image '
-complete -c convert -o crop                                        -d 'Cut out a rectangular region of the image [geometry]'
-complete -c convert -o deconstruct                                 -d 'Break down an image sequence into constituent parts'
-complete -c convert -o evaluate-sequence                           -d 'Evaluate an arithmetic, relational, or logical expression [operator]'
-complete -c convert -o flatten                                     -d 'Flatten a sequence of images'
-complete -c convert -o fx                                          -d 'Apply mathematical expression to an image channel(s) [expression]'
-complete -c convert -o hald-clut                                   -d 'Apply a Hald color lookup table to the image'
-complete -c convert -o morph                                       -d 'Morph an image sequence [value]'
-complete -c convert -o mosaic                                      -d 'Create a mosaic from an image sequence'
-complete -c convert -o print                                       -d 'Interpret string and print to console [string]'
-complete -c convert -o process                                     -d 'Process the image with a custom image filter [arguments]' -xa '(convert -list filter)'
-complete -c convert -o separate                                    -d 'Separate an image channel into a grayscale image'
-complete -c convert -o smush                                       -d 'Smush an image sequence together [geometry]'
-complete -c convert -o write                                       -d 'Write images to this file [filename]' -r
-complete -c convert -o clone                                       -d 'Clone an image [indexes]'
-complete -c convert -o delete                                      -d 'Delete the image from the image sequence [indexes]'
-complete -c convert -o duplicate                                   -d 'Duplicate an image one or more times [count,indexes]'
-complete -c convert -o insert                                      -d 'Insert last image into the image sequence [index]'
-complete -c convert -o reverse                                     -d 'Reverse image sequence'
-complete -c convert -o swap                                        -d 'Swap two images in the image sequence [indexes]'
-complete -c convert -o debug                                       -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
-complete -c convert -o help                                        -d 'Print program options'
-complete -c convert -o list                                        -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
-complete -c convert -o log                                         -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c convert -o version                                     -d 'Print version information'
-complete -c convert -o matte                                       -d 'Store matte channel if the image has one'
-complete -c convert -o origin                                      -d 'Image origin [geometry]'
-complete -c convert -o support                                     -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
-complete -c convert -o affinity                                    -d 'Transform image colors to match this set of colors [filename]' -r
+complete -c convert -o adjoin -d 'Join images into a single multi-image file'
+complete -c convert -o affine -d 'Affine transform matrix [matrix]'
+complete -c convert -o alpha -d 'Activate, deactivate, reset, or set the alpha channel [option]' -xa '(convert -list alpha)'
+complete -c convert -o antialias -d 'Remove pixel-aliasing '
+complete -c convert -o authenticate -d 'Decipher image with this password [password]'
+complete -c convert -o attenuate -d 'Lessen (or intensify) when adding noise to an image [value]'
+complete -c convert -o background -d 'Background color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o bias -d 'Add bias when convolving an image [value]'
+complete -c convert -o black-point-compensation -d 'Use black point compensation'
+complete -c convert -o blue-primary -d 'Chromaticity blue primary point [point]'
+complete -c convert -o bordercolor -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o caption -d 'Assign a caption to an image [string]'
+complete -c convert -o channel -d 'Apply option to select image channels [type]' -xa '(convert -list channel)'
+complete -c convert -o colors -d 'Preferred number of colors in the image [value]'
+complete -c convert -o colorspace -d 'Alternate image colorspace [type]' -xa '(convert -list colorspace)'
+complete -c convert -o comment -d 'Annotate image with comment [string]'
+complete -c convert -o compose -d 'Set image composite operator [operator]'
+complete -c convert -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(convert -list compress)'
+complete -c convert -o define -d 'Define one or more image format options [format:option]'
+complete -c convert -o delay -d 'Display the next image after pausing [value]'
+complete -c convert -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c convert -o depth -d 'Image depth [value]'
+complete -c convert -o direction -d 'Render text right-to-left or left-to-right [type]' -xa '(convert -list direction)'
+complete -c convert -o display -d 'Get image or font from this X server [server]'
+complete -c convert -o dispose -d 'Layer disposal method [method]' -xa '(convert -list dispose)'
+complete -c convert -o dither -d 'Apply error diffusion to image [method]' -xa '(convert -list dither)'
+complete -c convert -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c convert -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(convert -list endian)'
+complete -c convert -o family -d 'Render text with this font family [name]' -xa '(__fish_complete_convert_options family)'
+complete -c convert -o fill -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o filter -d 'Use this filter when resizing an image [type]' -xa '(convert -list filter)'
+complete -c convert -o font -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
+complete -c convert -o format -d 'Output formatted image characteristics ["string"]'
+complete -c convert -o fuzz -d 'Colors within this distance are considered equal [distance]'
+complete -c convert -o gravity -d 'Horizontal and vertical text placement [type]' -xa '(convert -list gravity)'
+complete -c convert -o green-primary -d 'Chromaticity green primary point [point]'
+complete -c convert -o intent -d 'Type of rendering intent when managing the image color [type]' -xa '(convert -list intent)'
+complete -c convert -o interlace -d 'Type of image interlacing scheme [type]' -xa '(convert -list interlace)'
+complete -c convert -o interline-spacing -d 'Set the space between two text lines [value]'
+complete -c convert -o interpolate -d 'Pixel color interpolation method [method]' -xa '(convert -list interpolate)'
+complete -c convert -o interword-spacing -d 'Set the space between two words [value]'
+complete -c convert -o kerning -d 'Set the space between two letters [value]'
+complete -c convert -o label -d 'Assign a label to an image [string]'
+complete -c convert -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c convert -o loop -d 'Add Netscape loop extension to your GIF animation [iterations]'
+complete -c convert -o mask -d 'Associate a mask with the image [filename]' -r
+complete -c convert -o mattecolor -d 'Frame color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o monitor -d 'Monitor progress '
+complete -c convert -o orient -d 'Image orientation [type]' -xa '(convert -list orientation)'
+complete -c convert -o page -d 'Size and location of an image canvas (setting) [geometry]'
+complete -c convert -o ping -d 'Efficiently determine image attributes'
+complete -c convert -o pointsize -d 'Font point size [value]'
+complete -c convert -o precision -d 'Maximum number of significant digits to print [value]'
+complete -c convert -o preview -d 'Image preview type [type]' -xa '(convert -list preview)'
+complete -c convert -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c convert -o quiet -d 'Suppress all warning messages'
+complete -c convert -o red-primary -d 'Chromaticity red primary point [point]'
+complete -c convert -o regard-warnings -d 'Pay attention to warning messages'
+complete -c convert -o remap -d 'Transform image colors to match this set of colors [filename]' -r
+complete -c convert -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c convert -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c convert -o scene -d 'Image scene number [value]'
+complete -c convert -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c convert -o size -d 'Width and height of image [geometry]'
+complete -c convert -o stretch -d 'Render text with this font stretch [type]' -xa '(convert -list stretch)'
+complete -c convert -o stroke -d 'Graphic primitive stroke color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o strokewidth -d 'Graphic primitive stroke width [value]'
+complete -c convert -o style -d 'Render text with this font style [type]' -xa '(convert -list style)'
+complete -c convert -o synchronize -d 'Synchronize image to storage device'
+complete -c convert -o taint -d 'Declare the image as modified'
+complete -c convert -o texture -d 'Name of texture to tile onto the image background [filename]' -r
+complete -c convert -o tile-offset -d 'Tile offset [geometry]'
+complete -c convert -o treedepth -d 'Color tree depth [value]'
+complete -c convert -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o undercolor -d 'Annotation bounding box color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o units -d 'The units of image resolution [type]' -xa '(convert -list units)'
+complete -c convert -o verbose -d 'Print detailed information about the image'
+complete -c convert -o view -d 'FlashPix viewing transforms'
+complete -c convert -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(convert -list virtual-pixel)'
+complete -c convert -o weight -d 'Render text with this font weight [type]' -x
+complete -c convert -o white-point -d 'Chromaticity white point [point]'
+complete -c convert -o adaptive-blur -d 'Adaptively blur pixels; decrease effect near edges [geometry]'
+complete -c convert -o adaptive-resize -d 'Adaptively resize image using \'mesh\' interpolation [geometry]'
+complete -c convert -o adaptive-sharpen -d 'Adaptively sharpen pixels; increase effect near edges [geometry]'
+complete -c convert -o annotate -d 'Annotate the image with text [geometry text]'
+complete -c convert -o auto-gamma -d 'Automagically adjust gamma level of image'
+complete -c convert -o auto-level -d 'Automagically adjust color levels of image'
+complete -c convert -o auto-orient -d 'Automagically orient (rotate) image'
+complete -c convert -o bench -d 'Measure performance [iterations]'
+complete -c convert -o black-threshold -d 'Force all pixels below the threshold into black [value]'
+complete -c convert -o blue-shift -d 'Simulate a scene at nighttime in the moonlight [factor]'
+complete -c convert -o blur -d 'Reduce image noise and reduce detail levels [geometry]'
+complete -c convert -o border -d 'Surround image with a border of color [geometry]'
+complete -c convert -o brightness-contrast -d 'Improve brightness / contrast of the image [geometry]'
+complete -c convert -o cdl -d 'Color correct with a color decision list [filename]' -r
+complete -c convert -o charcoal -d 'Simulate a charcoal drawing [radius]'
+complete -c convert -o chop -d 'Remove pixels from the image interior [geometry]'
+complete -c convert -o clamp -d 'Restrict pixel range from 0 to the quantum depth'
+complete -c convert -o clip -d 'Clip along the first path from the 8BIM profile'
+complete -c convert -o clip-mask -d 'Associate a clip mask with the image [filename]' -r
+complete -c convert -o clip-path -d 'Clip along a named path from the 8BIM profile [id]'
+complete -c convert -o colorize -d 'Colorize the image with the fill color [value]'
+complete -c convert -o color-matrix -d 'Apply color correction to the image [matrix]'
+complete -c convert -o contrast -d 'Enhance or reduce the image contrast'
+complete -c convert -o contrast-stretch -d 'Improve contrast by `stretching\' the intensity range [geometry]'
+complete -c convert -o convolve -d 'Apply a convolution kernel to the image [coefficients]'
+complete -c convert -o cycle -d 'Cycle the image colormap [amount]'
+complete -c convert -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c convert -o deskew -d 'Straighten an image [threshold]'
+complete -c convert -o despeckle -d 'Reduce the speckles within an image'
+complete -c convert -o distort -d 'Args distort images according to given method ad args [method]' -xa '(convert -list distort)'
+complete -c convert -o draw -d 'Annotate the image with a graphic primitive [string]'
+complete -c convert -o edge -d 'Apply a filter to detect edges in the image [radius]'
+complete -c convert -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
+complete -c convert -o emboss -d 'Emboss an image [radius]'
+complete -c convert -o enhance -d 'Apply a digital filter to enhance a noisy image'
+complete -c convert -o equalize -d 'Perform histogram equalization to an image'
+complete -c convert -o evaluate -d 'Evaluate an arithmetic, relational, or logical expression [operator value]'
+complete -c convert -o extent -d 'Set the image size [geometry]'
+complete -c convert -o extract -d 'Extract area from image [geometry]'
+complete -c convert -o fft -d 'Implements the discrete Fourier transform (DFT)'
+complete -c convert -o flip -d 'Flip image vertically'
+complete -c convert -o floodfill -d 'Color floodfill the image with color [geometry]'
+complete -c convert -o flop -d 'Flop image horizontally'
+complete -c convert -o frame -d 'Surround image with an ornamental border [geometry]'
+complete -c convert -o function -d 'Apply function over image values [name parameters]' -xa '(convert -list function)'
+complete -c convert -o gamma -d 'Level of gamma correction [value]'
+complete -c convert -o gaussian-blur -d 'Reduce image noise and reduce detail levels [geometry]'
+complete -c convert -o geometry -d 'Preferred size or location of the image [geometry]'
+complete -c convert -o identify -d 'Identify the format and characteristics of the image'
+complete -c convert -o ift -d 'Implements the inverse discrete Fourier transform (DFT)'
+complete -c convert -o implode -d 'Implode image pixels about the center [amount]'
+complete -c convert -o lat -d 'Local adaptive thresholding [geometry]'
+complete -c convert -o layers -d 'Optimize, merge,  or compare image layers [method]' -xa '(convert -list layers)'
+complete -c convert -o level -d 'Adjust the level of image contrast [value]'
+complete -c convert -o level-colors -d 'Level image with the given colors [color,color]' -xa '(__fish_complete_list , "__fish_complete_convert_options color")'
+complete -c convert -o linear-stretch -d 'Improve contrast by `stretching with saturation\' [geometry]'
+complete -c convert -o liquid-rescale -d 'Rescale image with seam-carving [geometry]'
+complete -c convert -o median -d 'Apply a median filter to the image [geometry]'
+complete -c convert -o mode -d 'Make each pixel the \'predominant color\' of the neighborhood [geometry]'
+complete -c convert -o modulate -d 'Vary the brightness, saturation, and hue [value]'
+complete -c convert -o monochrome -d 'Transform image to black and white'
+complete -c convert -o morphology -d 'Apply a morphology method to the image [method kernel]' -xa '(convert -list morphology)'
+complete -c convert -o motion-blur -d 'Simulate motion blur [geometry]'
+complete -c convert -o negate -d 'Replace every pixel with its complementary color '
+complete -c convert -o noise -d 'Add or reduce noise in an image [geometry]'
+complete -c convert -o normalize -d 'Transform image to span the full range of colors'
+complete -c convert -o opaque -d 'Change this color to the fill color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o ordered-dither -d 'Add a noise pattern to the image with specific amplitudes  [NxN]'
+complete -c convert -o paint -d 'Simulate an oil painting [radius]'
+complete -c convert -o polaroid -d 'Simulate a Polaroid picture [angle]'
+complete -c convert -o posterize -d 'Reduce the image to a limited number of color levels [levels]'
+complete -c convert -o profile -d 'Add, delete, or apply an image profile [filename]' -r
+complete -c convert -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(convert -list colorspace)'
+complete -c convert -o radial-blur -d 'Radial blur the image [angle]'
+complete -c convert -o raise -d 'Lighten/darken image edges to create a 3-D effect [value]'
+complete -c convert -o random-threshold -d 'Random threshold the image [low,high]'
+complete -c convert -o region -d 'Apply options to a portion of the image [geometry]'
+complete -c convert -o render -d 'Render vector graphics'
+complete -c convert -o repage -d 'Size and location of an image canvas [geometry]'
+complete -c convert -o resample -d 'Change the resolution of an image [geometry]'
+complete -c convert -o resize -d 'Resize the image [geometry]'
+complete -c convert -o roll -d 'Roll an image vertically or horizontally [geometry]'
+complete -c convert -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c convert -o sample -d 'Scale image with pixel sampling [geometry]'
+complete -c convert -o scale -d 'Scale the image [geometry]'
+complete -c convert -o segment -d 'Segment an image [values]'
+complete -c convert -o selective-blur -d 'Selectively blur pixels within a contrast threshold [geometry]'
+complete -c convert -o sepia-tone -d 'Simulate a sepia-toned photo [threshold]'
+complete -c convert -o set -d 'Set an image property [property value]'
+complete -c convert -o shade -d 'Shade the image using a distant light source [degrees]'
+complete -c convert -o shadow -d 'Simulate an image shadow [geometry]'
+complete -c convert -o sharpen -d 'Sharpen the image [geometry]'
+complete -c convert -o shave -d 'Shave pixels from the image edges [geometry]'
+complete -c convert -o shear -d 'Slide one edge of the image along the X or Y axis [geometry]'
+complete -c convert -o sigmoidal-contrast -d 'Increase the contrast without saturating highlights or shadows [geometry]'
+complete -c convert -o sketch -d 'Simulate a pencil sketch [geometry]'
+complete -c convert -o solarize -d 'Negate all pixels above the threshold level [threshold]'
+complete -c convert -o sparse-color -d 'Args fill in a image based on a few color points [method]' -xa '(convert -list sparse-color)'
+complete -c convert -o splice -d 'Splice the background color into the image [geometry]'
+complete -c convert -o spread -d 'Displace image pixels by a random amount [radius]'
+complete -c convert -o statistic -d 'Replace each pixel with corresponding statistic from the neighborhood [type geometry]' -xa '(convert -list statistic)'
+complete -c convert -o strip -d 'Strip image of all profiles and comments'
+complete -c convert -o swirl -d 'Swirl image pixels about the center [degrees]'
+complete -c convert -o threshold -d 'Threshold the image [value]'
+complete -c convert -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c convert -o tile -d 'Tile image when filling a graphic primitive [filename]' -r
+complete -c convert -o tint -d 'Tint the image with the fill color [value]'
+complete -c convert -o transform -d 'Affine transform image'
+complete -c convert -o transparent -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
+complete -c convert -o transpose -d 'Flip image vertically and rotate 90 degrees'
+complete -c convert -o transverse -d 'Flop image horizontally and rotate 270 degrees'
+complete -c convert -o trim -d 'Trim image edges'
+complete -c convert -o type -d 'Image type [type]' -xa '(convert -list type)'
+complete -c convert -o unique-colors -d 'Discard all but one of any pixel color'
+complete -c convert -o unsharp -d 'Sharpen the image [geometry]'
+complete -c convert -o vignette -d 'Soften the edges of the image in vignette style [geometry]'
+complete -c convert -o wave -d 'Alter an image along a sine wave [geometry]'
+complete -c convert -o white-threshold -d 'Force all pixels above the threshold into white [value]'
+complete -c convert -o append -d 'Append an image sequence'
+complete -c convert -o clut -d 'Apply a color lookup table to the image'
+complete -c convert -o coalesce -d 'Merge a sequence of images'
+complete -c convert -o combine -d 'Combine a sequence of images'
+complete -c convert -o composite -d 'Composite image '
+complete -c convert -o crop -d 'Cut out a rectangular region of the image [geometry]'
+complete -c convert -o deconstruct -d 'Break down an image sequence into constituent parts'
+complete -c convert -o evaluate-sequence -d 'Evaluate an arithmetic, relational, or logical expression [operator]'
+complete -c convert -o flatten -d 'Flatten a sequence of images'
+complete -c convert -o fx -d 'Apply mathematical expression to an image channel(s) [expression]'
+complete -c convert -o hald-clut -d 'Apply a Hald color lookup table to the image'
+complete -c convert -o morph -d 'Morph an image sequence [value]'
+complete -c convert -o mosaic -d 'Create a mosaic from an image sequence'
+complete -c convert -o print -d 'Interpret string and print to console [string]'
+complete -c convert -o process -d 'Process the image with a custom image filter [arguments]' -xa '(convert -list filter)'
+complete -c convert -o separate -d 'Separate an image channel into a grayscale image'
+complete -c convert -o smush -d 'Smush an image sequence together [geometry]'
+complete -c convert -o write -d 'Write images to this file [filename]' -r
+complete -c convert -o clone -d 'Clone an image [indexes]'
+complete -c convert -o delete -d 'Delete the image from the image sequence [indexes]'
+complete -c convert -o duplicate -d 'Duplicate an image one or more times [count,indexes]'
+complete -c convert -o insert -d 'Insert last image into the image sequence [index]'
+complete -c convert -o reverse -d 'Reverse image sequence'
+complete -c convert -o swap -d 'Swap two images in the image sequence [indexes]'
+complete -c convert -o debug -d 'Display copious debugging information [events]' -xa '(convert -list debug)'
+complete -c convert -o help -d 'Print program options'
+complete -c convert -o list -d 'Print a list of supported option arguments [type]' -xa '(convert -list list)'
+complete -c convert -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c convert -o version -d 'Print version information'
+complete -c convert -o matte -d 'Store matte channel if the image has one'
+complete -c convert -o origin -d 'Image origin [geometry]'
+complete -c convert -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c convert -o affinity -d 'Transform image colors to match this set of colors [filename]' -r
diff --git a/share/completions/cp.fish b/share/completions/cp.fish
index 181b44bfc..d095c5ccb 100644
--- a/share/completions/cp.fish
+++ b/share/completions/cp.fish
@@ -1,76 +1,76 @@
-if cp --version 2>/dev/null > /dev/null # GNU cp
-	complete -c cp -s a -l archive -d "Same as -dpR"
-	complete -c cp -s b -l backup -d "Make backup of each existing destination file" -a "none off numbered t existing nil simple never"
-	complete -c cp -l copy-contents -d "Copy contents of special files when recursive"
-	complete -c cp -s d -d "Same as --no-dereference --preserve=link"
-	complete -c cp -s f -l force -d "Do not prompt before overwriting"
-	complete -c cp -s i -l interactive -d "Prompt before overwrite"
-	complete -c cp -s H -d "Follow command-line symbolic links"
-	complete -c cp -s l -l link -d "Link files instead of copying"
-	complete -c cp -l strip-trailing-slashes -d "Remove trailing slashes from source"
-	complete -c cp -s S -l suffix -r -d "Backup suffix"
-	complete -c cp -s t -l target-directory -d "Target directory" -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
-	complete -c cp -s u -l update -d "Do not overwrite newer files"
-	complete -c cp -s v -l verbose -d "Verbose mode"
-	complete -c cp -l help -d "Display help and exit"
-	complete -c cp -l version -d "Display version and exit"
-	complete -c cp -s L -l dereference -d "Always follow symbolic links"
-	complete -c cp -s P -l no-dereference -d "Never follow symbolic links"
-	complete -c cp -s p  -d "Same as --preserve=mode,ownership,timestamps"
-	complete -c cp -f -l preserve -d "Preserve ATTRIBUTES if possible" -xa "mode ownership timestamps links all"
-	complete -c cp -f -l no-preserve -r -d "Don't preserve ATTRIBUTES" -xa "mode ownership timestamps links all"
-	complete -c cp -l parents -d "Use full source file name under DIRECTORY"
-	complete -c cp -s r -s R -l recursive -d "Copy directories recursively"
-	complete -c cp -l remove-destination -d "First remove existing destination files"
-	complete -c cp -f -l sparse -r -d "Control creation of sparse files" -xa "always auto never"
-	complete -c cp -s s -l symbolic-link -d "Make symbolic links instead of copying"
-	complete -c cp -s T -l no-target-directory -d "Treat DEST as a normal file"
-	complete -c cp -s x -l one-file-system -d "Stay on this file system"
-	complete -c cp -s X -l context -r -d "Set SELinux context of copy to CONTEXT"
+if cp --version 2>/dev/null >/dev/null # GNU cp
+    complete -c cp -s a -l archive -d "Same as -dpR"
+    complete -c cp -s b -l backup -d "Make backup of each existing destination file" -a "none off numbered t existing nil simple never"
+    complete -c cp -l copy-contents -d "Copy contents of special files when recursive"
+    complete -c cp -s d -d "Same as --no-dereference --preserve=link"
+    complete -c cp -s f -l force -d "Do not prompt before overwriting"
+    complete -c cp -s i -l interactive -d "Prompt before overwrite"
+    complete -c cp -s H -d "Follow command-line symbolic links"
+    complete -c cp -s l -l link -d "Link files instead of copying"
+    complete -c cp -l strip-trailing-slashes -d "Remove trailing slashes from source"
+    complete -c cp -s S -l suffix -r -d "Backup suffix"
+    complete -c cp -s t -l target-directory -d "Target directory" -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
+    complete -c cp -s u -l update -d "Do not overwrite newer files"
+    complete -c cp -s v -l verbose -d "Verbose mode"
+    complete -c cp -l help -d "Display help and exit"
+    complete -c cp -l version -d "Display version and exit"
+    complete -c cp -s L -l dereference -d "Always follow symbolic links"
+    complete -c cp -s P -l no-dereference -d "Never follow symbolic links"
+    complete -c cp -s p -d "Same as --preserve=mode,ownership,timestamps"
+    complete -c cp -f -l preserve -d "Preserve ATTRIBUTES if possible" -xa "mode ownership timestamps links all"
+    complete -c cp -f -l no-preserve -r -d "Don't preserve ATTRIBUTES" -xa "mode ownership timestamps links all"
+    complete -c cp -l parents -d "Use full source file name under DIRECTORY"
+    complete -c cp -s r -s R -l recursive -d "Copy directories recursively"
+    complete -c cp -l remove-destination -d "First remove existing destination files"
+    complete -c cp -f -l sparse -r -d "Control creation of sparse files" -xa "always auto never"
+    complete -c cp -s s -l symbolic-link -d "Make symbolic links instead of copying"
+    complete -c cp -s T -l no-target-directory -d "Treat DEST as a normal file"
+    complete -c cp -s x -l one-file-system -d "Stay on this file system"
+    complete -c cp -s X -l context -r -d "Set SELinux context of copy to CONTEXT"
 else # BSD/macOS
-	set -l uname (uname -s)
-	# Solaris:   cp [-R | r [H | L | P ]] [-fi ] [-p        ]
-	# openbsd:   cp	[-R |   [H | L | P ]] [-fi ] [-pv       ]
-	# macos:     cp [-R |   [H | L | P ]] [-fin] [-pva   cX ] # -c: clone -X: copy xattrs
-	# netbsd:    cp [-R |   [H | L | P ]] [-fi ] [-pval    N] # -l: hard link instead of copy -N: don't copy file flags
-	# dragonfly: cp [-R |   [H | L | P ]] [-fin] [-pvalx    ] # -x: don't traverse mount points
-	# freebsd:   cp	[-R |   [H | L | P ]] [-fin] [-pvalxs   ] # -s: symlink instead of copy
-	if [ "$uname" = SunOS ] # annoying
-		complete -c cp -s r -d "Copy directories recursively"
-		complete -c cp -s R -d "Like -r, but replicating pipes instead of reading pipes"
-	else
-		complete -c cp -s R -d "Copy directories recursively"
-	end
-	complete -c cp -s H -d "-R: Follow symlink arguments"
-	complete -c cp -s L -d "-R: Follow all symlinks"
-	complete -c cp -s P -d "-R: Don't follow symlinks (default)"
+    set -l uname (uname -s)
+    # Solaris:   cp [-R | r [H | L | P ]] [-fi ] [-p        ]
+    # openbsd:   cp	[-R |   [H | L | P ]] [-fi ] [-pv       ]
+    # macos:     cp [-R |   [H | L | P ]] [-fin] [-pva   cX ] # -c: clone -X: copy xattrs
+    # netbsd:    cp [-R |   [H | L | P ]] [-fi ] [-pval    N] # -l: hard link instead of copy -N: don't copy file flags
+    # dragonfly: cp [-R |   [H | L | P ]] [-fin] [-pvalx    ] # -x: don't traverse mount points
+    # freebsd:   cp	[-R |   [H | L | P ]] [-fin] [-pvalxs   ] # -s: symlink instead of copy
+    if [ "$uname" = SunOS ] # annoying
+        complete -c cp -s r -d "Copy directories recursively"
+        complete -c cp -s R -d "Like -r, but replicating pipes instead of reading pipes"
+    else
+        complete -c cp -s R -d "Copy directories recursively"
+    end
+    complete -c cp -s H -d "-R: Follow symlink arguments"
+    complete -c cp -s L -d "-R: Follow all symlinks"
+    complete -c cp -s P -d "-R: Don't follow symlinks (default)"
 
-	complete -c cp -s f -d "Don't confirm to overwrite"
-	complete -c cp -s i -d "Prompt before overwrite"
-	not contains "$uname" SunOS OpenBSD NetBSD
-		and complete -c cp -s n -d "Don't overwrite existing"
+    complete -c cp -s f -d "Don't confirm to overwrite"
+    complete -c cp -s i -d "Prompt before overwrite"
+    not contains "$uname" SunOS OpenBSD NetBSD
+    and complete -c cp -s n -d "Don't overwrite existing"
 
-	complete -c cp -s p -d "Preserve attributes of source"
-	if [ "$uname" = SunOS ]
-		exit 0
-	end
-	complete -c cp -s v -d "Print filenames as they're copied"
-	if [ "$uname" = OpenBSD ]
-		exit 0
-	end
-	complete -c cp -s a -d "Archive mode (-pPR)"
-	if [ "$uname" = Darwin ]
-		complete -c cp -s c -d "Clone using clonefile(2)"
-		complete -c cp -s X -d "Omit xattrs, resource forks"
-		exit 0
-	end
-	complete -c cp -s l -d "Hard link instead of copying"
-	if [ "$uname" = NetBSD ]
-		complete -c cp -s N -d "Don't copy file flags"
-		exit 0
-	end
-	complete -c cp -s x -d "Don't traverse mount points"
-	if [ "$uname" = FreeBSD ]
-		complete -c cp -s s -d "Symlink instead of copying"
-	end
+    complete -c cp -s p -d "Preserve attributes of source"
+    if [ "$uname" = SunOS ]
+        exit 0
+    end
+    complete -c cp -s v -d "Print filenames as they're copied"
+    if [ "$uname" = OpenBSD ]
+        exit 0
+    end
+    complete -c cp -s a -d "Archive mode (-pPR)"
+    if [ "$uname" = Darwin ]
+        complete -c cp -s c -d "Clone using clonefile(2)"
+        complete -c cp -s X -d "Omit xattrs, resource forks"
+        exit 0
+    end
+    complete -c cp -s l -d "Hard link instead of copying"
+    if [ "$uname" = NetBSD ]
+        complete -c cp -s N -d "Don't copy file flags"
+        exit 0
+    end
+    complete -c cp -s x -d "Don't traverse mount points"
+    if [ "$uname" = FreeBSD ]
+        complete -c cp -s s -d "Symlink instead of copying"
+    end
 end
diff --git a/share/completions/cygport.fish b/share/completions/cygport.fish
index 92c5497d0..9c993f414 100644
--- a/share/completions/cygport.fish
+++ b/share/completions/cygport.fish
@@ -1,32 +1,32 @@
 
 # Options
-complete -c cygport -s 4 -l 32    -d "Build for 32-bit Cygwin"
-complete -c cygport -s 8 -l 64    -d "Build for 64-bit Cygwin"
-complete -c cygport      -l debug -d "Enable debugging messages"
+complete -c cygport -s 4 -l 32 -d "Build for 32-bit Cygwin"
+complete -c cygport -s 8 -l 64 -d "Build for 64-bit Cygwin"
+complete -c cygport -l debug -d "Enable debugging messages"
 
 # Cygport file
 complete -c cygport -n '__fish_is_first_token' -f -a '*.cygport' -d "Cygport file"
 
 # Commands
 complete -c cygport -n 'not __fish_is_first_token' -f -a 'downloadall fetchall wgetall getall' -d "Download all sources"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'download fetch wget get'             -d "Download missing sources"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'prep unpack'                         -d "Prepare source directory"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'compile build make'                  -d "Build software"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'check test'                          -d "Run test suite"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'inst install'                        -d "Install into DESTDIR and run post-installation steps"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'postinst'                            -d "Run post-installation steps"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'list'                                -d "List package files"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'listdebug listdbg'                   -d "List debug package files"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'dep'                                 -d "Show dependencies"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'info'                                -d "Show packaging info"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'homepage web www'                    -d "Show project homepage URL"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'package-test pkg-test'               -d "Create packages, marked as test"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'package pkg'                         -d "Create packages"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'diff mkdiff mkpatch'                 -d "Create source patches"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'upload up'                           -d "Upload finished packages"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'stage'                               -d "Upload packages without marking !ready"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'announce'                            -d "Send announcement email"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'clean finish'                        -d "Delete working directory"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'almostall all'                       -d "Same as prep build inst pkg"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'help'                                -d "Show help"
-complete -c cygport -n 'not __fish_is_first_token' -f -a 'version'                             -d "Show version"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'download fetch wget get' -d "Download missing sources"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'prep unpack' -d "Prepare source directory"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'compile build make' -d "Build software"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'check test' -d "Run test suite"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'inst install' -d "Install into DESTDIR and run post-installation steps"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'postinst' -d "Run post-installation steps"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'list' -d "List package files"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'listdebug listdbg' -d "List debug package files"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'dep' -d "Show dependencies"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'info' -d "Show packaging info"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'homepage web www' -d "Show project homepage URL"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'package-test pkg-test' -d "Create packages, marked as test"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'package pkg' -d "Create packages"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'diff mkdiff mkpatch' -d "Create source patches"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'upload up' -d "Upload finished packages"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'stage' -d "Upload packages without marking !ready"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'announce' -d "Send announcement email"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'clean finish' -d "Delete working directory"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'almostall all' -d "Same as prep build inst pkg"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'help' -d "Show help"
+complete -c cygport -n 'not __fish_is_first_token' -f -a 'version' -d "Show version"
diff --git a/share/completions/darcs.fish b/share/completions/darcs.fish
index 6638ca1ab..b5cabf362 100644
--- a/share/completions/darcs.fish
+++ b/share/completions/darcs.fish
@@ -41,35 +41,35 @@ complete -c darcs -n '__fish_use_subcommand' -x -a repair -d 'Repair a corrupted
 complete -c darcs -n '__fish_use_subcommand' -x -a convert -d 'Convert repositories between various formats'
 
 function __fish_darcs_use_show_command
-  set -l cmd (commandline -poc)
-  set -e cmd[1]
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
 
-  if contains 'show' $cmd
-    for i in $cmd
-      switch $i
-        case contents
-          return 1
-        case dependencies
-          return 1
-        case files
-          return 1
-        case index
-          return 1
-        case pristine
-          return 1
-        case repo
-          return 1
-        case authors
-          return 1
-        case tags
-          return 1
-        case patch-index
-          return 1
-      end
+    if contains 'show' $cmd
+        for i in $cmd
+            switch $i
+                case contents
+                    return 1
+                case dependencies
+                    return 1
+                case files
+                    return 1
+                case index
+                    return 1
+                case pristine
+                    return 1
+                case repo
+                    return 1
+                case authors
+                    return 1
+                case tags
+                    return 1
+                case patch-index
+                    return 1
+            end
+        end
+        return 0
     end
-    return 0
-  end
-  return 1
+    return 1
 end
 
 complete -c darcs -n '__fish_darcs_use_show_command' -x -a contents -d 'Outputs a specific version of a file'
@@ -83,39 +83,39 @@ complete -c darcs -n '__fish_darcs_use_show_command' -x -a tags -d 'Show all tag
 complete -c darcs -n '__fish_darcs_use_show_command' -x -a patch-index -d 'Check integrity of patch index'
 
 function __fish_darcs_use_optimize_command
-  set -l cmd (commandline -poc)
-  set -e cmd[1]
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
 
-  if contains 'optimize' $cmd
-    for i in $cmd
-      switch $i
-        case clean
-          return 1
-        case http
-          return 1
-        case reorder
-          return 1
-        case enable-patch-index
-          return 1
-        case disable-patch-index
-          return 1
-        case compress
-          return 1
-        case uncompress
-          return 1
-        case relink
-          return 1
-        case pristine
-          return 1
-        case upgrade
-          return 1
-        case cache
-          return 1
-      end
+    if contains 'optimize' $cmd
+        for i in $cmd
+            switch $i
+                case clean
+                    return 1
+                case http
+                    return 1
+                case reorder
+                    return 1
+                case enable-patch-index
+                    return 1
+                case disable-patch-index
+                    return 1
+                case compress
+                    return 1
+                case uncompress
+                    return 1
+                case relink
+                    return 1
+                case pristine
+                    return 1
+                case upgrade
+                    return 1
+                case cache
+                    return 1
+            end
+        end
+        return 0
     end
-    return 0
-  end
-  return 1
+    return 1
 end
 
 complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a clean -d 'Garbage collect pristine, inventories and patches'
@@ -132,23 +132,23 @@ complete -c darcs -n '__fish_darcs_use_optimize_command' -x -a cache -d 'Garbage
 
 
 function __fish_darcs_use_convert_command
-  set -l cmd (commandline -poc)
-  set -e cmd[1]
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
 
-  if contains 'convert' $cmd
-    for i in $cmd
-      switch $i
-        case darcs-2
-          return 1
-        case export
-          return 1
-        case import
-          return 1
-      end
+    if contains 'convert' $cmd
+        for i in $cmd
+            switch $i
+                case darcs-2
+                    return 1
+                case export
+                    return 1
+                case import
+                    return 1
+            end
+        end
+        return 0
     end
-    return 0
-  end
-  return 1
+    return 1
 end
 
 complete -c darcs -l 'help' -d 'Show a brief description of the command and its options'
diff --git a/share/completions/date.fish b/share/completions/date.fish
index ed1a0f043..63a89945f 100644
--- a/share/completions/date.fish
+++ b/share/completions/date.fish
@@ -1,41 +1,41 @@
 complete -c date -f -d "display or set date and time"
-if date --version > /dev/null 2>/dev/null
-	complete -c date -s d -l date -d "Display date described by string" -x
-	complete -c date -s f -l file -d "Display date for each line in file" -r
-	complete -c date -s I -l iso-8601 -d "Output in ISO-8601 format" -x -a "date hours minutes seconds"
-	complete -c date -s s -l set -d "Set time" -x
-	complete -c date -s R -l rfc-2822 -d "Output RFC-2822 date string"
-	complete -c date -s r -l reference -d "Display last modification time of file" -r
-	complete -c date -s u -l utc -d "Print/set UTC time" -f
-	complete -c date -l universal -d "Print/set UTC time" -f
-	complete -c date -s h -l help -d "Display help and exit" -f
-	complete -c date -s v -l version -d "Display version and exit" -f
+if date --version >/dev/null 2>/dev/null
+    complete -c date -s d -l date -d "Display date described by string" -x
+    complete -c date -s f -l file -d "Display date for each line in file" -r
+    complete -c date -s I -l iso-8601 -d "Output in ISO-8601 format" -x -a "date hours minutes seconds"
+    complete -c date -s s -l set -d "Set time" -x
+    complete -c date -s R -l rfc-2822 -d "Output RFC-2822 date string"
+    complete -c date -s r -l reference -d "Display last modification time of file" -r
+    complete -c date -s u -l utc -d "Print/set UTC time" -f
+    complete -c date -l universal -d "Print/set UTC time" -f
+    complete -c date -s h -l help -d "Display help and exit" -f
+    complete -c date -s v -l version -d "Display version and exit" -f
 else
-	complete -c date -s u -d 'Display or set UTC time' -f
-	complete -c date -s j -d "Don't actually set the clock" -f
-	complete -c date -s d -d "Set system's value for DST" -x
+    complete -c date -s u -d 'Display or set UTC time' -f
+    complete -c date -s j -d "Don't actually set the clock" -f
+    complete -c date -s d -d "Set system's value for DST" -x
 
-	set -l uname (uname -s)
+    set -l uname (uname -s)
 
-	test "$uname" != OpenBSD
-	and complete -c date -s n -d 'Set clock for local machine only' -f
+    test "$uname" != OpenBSD
+    and complete -c date -s n -d 'Set clock for local machine only' -f
 
-	switch $uname
-		case FreeBSD Darwin DragonFly
-			# only -u is actually POSIX. Rest are BSD extensions:
-			complete -c date -s r -d "Show file mtime, or format seconds" -r
-			complete -c date -s v -d 'Adjust clock +/- by time specified' -f
-		case NetBSD OpenBSD
-			complete -c date -s a -d "Change clock slowly with adjtime" -x
-			complete -c date -s r -d "Show date given seconds since epoch" -x
-			if test "$uname" = NetBSD
-				complete -c date -s d -d "Parse human-described date-time and show result" -x
-				exit
-			end
-			complete -c date -s z -d "Specify timezone for output" -x
-	end
-	
-	complete -c date -s t -d "Set system's minutes west of GMT" -x
-	complete -c date -s f -d 'Use format string to parse date' -f
+    switch $uname
+        case FreeBSD Darwin DragonFly
+            # only -u is actually POSIX. Rest are BSD extensions:
+            complete -c date -s r -d "Show file mtime, or format seconds" -r
+            complete -c date -s v -d 'Adjust clock +/- by time specified' -f
+        case NetBSD OpenBSD
+            complete -c date -s a -d "Change clock slowly with adjtime" -x
+            complete -c date -s r -d "Show date given seconds since epoch" -x
+            if test "$uname" = NetBSD
+                complete -c date -s d -d "Parse human-described date-time and show result" -x
+                exit
+            end
+            complete -c date -s z -d "Specify timezone for output" -x
+    end
+
+    complete -c date -s t -d "Set system's minutes west of GMT" -x
+    complete -c date -s f -d 'Use format string to parse date' -f
 end
 
diff --git a/share/completions/df.fish b/share/completions/df.fish
index 5809ae91d..833e87e21 100644
--- a/share/completions/df.fish
+++ b/share/completions/df.fish
@@ -18,21 +18,21 @@ __fish_gnu_complete -c df -s t -l type -r -d "Show file systems of specified typ
 
 if test -n "$is_gnu"
 
-        complete -c df -s a -l all -d "Include empty file systems"
-	complete -c df -s B -l block-size -r -d "Block size"
-	complete -c df -s H -l si -d "Human readable sizes, powers of 1000"
-	complete -c df -l no-sync -d "Do not sync before getting usage info"
-	complete -c df -l sync -d "Sync before getting usage info"
-        complete -c df -s T -l print-type -d "Print file system type"
-        complete -c df -s x -l exclude-type -d "Excluded file system type" -r -x -a "(__fish_print_filesystems)"
-	complete -c df -l help -d "Display help and exit"
-	complete -c df -l version -d "Display version and exit"
+    complete -c df -s a -l all -d "Include empty file systems"
+    complete -c df -s B -l block-size -r -d "Block size"
+    complete -c df -s H -l si -d "Human readable sizes, powers of 1000"
+    complete -c df -l no-sync -d "Do not sync before getting usage info"
+    complete -c df -l sync -d "Sync before getting usage info"
+    complete -c df -s T -l print-type -d "Print file system type"
+    complete -c df -s x -l exclude-type -d "Excluded file system type" -r -x -a "(__fish_print_filesystems)"
+    complete -c df -l help -d "Display help and exit"
+    complete -c df -l version -d "Display version and exit"
 
 else
 
-        complete -c df -s a -d "Show all file systems"
-	complete -c df -s g -d "Show sizes in gigabytes"
-	complete -c df -s m -d "Show sizes in megabytes"
-	complete -c df -s n -d "Print out the previously obtained statistics from the file systems"
+    complete -c df -s a -d "Show all file systems"
+    complete -c df -s g -d "Show sizes in gigabytes"
+    complete -c df -s m -d "Show sizes in megabytes"
+    complete -c df -s n -d "Print out the previously obtained statistics from the file systems"
 
 end
diff --git a/share/completions/diskutil.fish b/share/completions/diskutil.fish
index a75b622d1..ca9265a8e 100644
--- a/share/completions/diskutil.fish
+++ b/share/completions/diskutil.fish
@@ -5,11 +5,13 @@
 #############
 
 function __fish_diskutil_devices
-    set -l mountpoints /dev/disk*; printf '%s\n' $mountpoints
+    set -l mountpoints /dev/disk*
+    printf '%s\n' $mountpoints
 end
 
 function __fish_diskutil_mounted_volumes
-    set -l mountpoints /Volumes/*; printf '%s\n' $mountpoints
+    set -l mountpoints /Volumes/*
+    printf '%s\n' $mountpoints
 end
 
 function __fish_diskutil_using_not_subcommand
diff --git a/share/completions/display.fish b/share/completions/display.fish
index b0750bd0d..8a764dd2b 100644
--- a/share/completions/display.fish
+++ b/share/completions/display.fish
@@ -1,97 +1,97 @@
-complete -c display -o alpha                        -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(display -list alpha)'
-complete -c display -o antialias                    -d 'Remove pixel-aliasing '
-complete -c display -o authenticate                 -d 'Decipher image with this password [password]'
-complete -c display -o backdrop                     -d 'Display image centered on a backdrop'
-complete -c display -o channel                      -d 'Apply option to select image channels [type]' -xa '(display -list channel)'
-complete -c display -o colormap                     -d 'Shared or Private [type]' -x
-complete -c display -o colorspace                   -d 'Alternate image colorspace [type]' -xa '(display -list colorspace)'
-complete -c display -o comment                      -d 'Annotate image with comment [string]'
-complete -c display -o compress                     -d 'Type of pixel compression when writing the image [type]' -xa '(display -list compress)'
-complete -c display -o define                       -d 'Define one or more image format options [format:option]'
-complete -c display -o delay                        -d 'Display the next image after pausing [value]'
-complete -c display -o density                      -d 'Horizontal and vertical density of the image [geometry]'
-complete -c display -o depth                        -d 'Image depth [value]'
-complete -c display -o display                      -d 'Display image to this X server [server]'
-complete -c display -o dispose                      -d 'Layer disposal method [method]' -xa '(display -list dispose)'
-complete -c display -o dither                       -d 'Apply error diffusion to image [method]' -xa '(display -list dither)'
-complete -c display -o endian                       -d 'Endianness (MSB or LSB) of the image [type]' -xa '(display -list endian)'
-complete -c display -o filter                       -d 'Use this filter when resizing an image [type]' -xa '(display -list filter)'
-complete -c display -o format                       -d 'Output formatted image characteristics [string]'
-complete -c display -o geometry                     -d 'Preferred size and location of the Image window [geometry]'
-complete -c display -o gravity                      -d 'Horizontal and vertical backdrop placement [type]' -xa '(display -list gravity)'
-complete -c display -o identify                     -d 'Identify the format and characteristics of the image'
-complete -c display -o immutable                    -d 'Displayed image cannot be modified'
-complete -c display -o interlace                    -d 'Type of image interlacing scheme [type]' -xa '(display -list interlace)'
-complete -c display -o interpolate                  -d 'Pixel color interpolation method [method]' -xa '(display -list interpolate)'
-complete -c display -o label                        -d 'Assign a label to an image [string]'
-complete -c display -o limit                        -d 'Pixel cache resource limit [type value]' -x
-complete -c display -o loop                         -d 'Loop images then exit [iterations]'
-complete -c display -o map                          -d 'Display image using this Standard Colormap [type]' -x
-complete -c display -o monitor                      -d 'Monitor progress '
-complete -c display -o page                         -d 'Size and location of an image canvas [geometry]'
-complete -c display -o profile                      -d 'Add, delete, or apply an image profile [filename]' -r
-complete -c display -o quality                      -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c display -o quantize                     -d 'Reduce colors in this colorspace [colorspace]' -xa '(display -list colorspace)'
-complete -c display -o quiet                        -d 'Suppress all warning messages'
-complete -c display -o regard-warnings              -d 'Pay attention to warning messages'
-complete -c display -o remote                       -d 'Command execute a command in an remote display process'
-complete -c display -o repage                       -d 'Size and location of an image canvas (operator) [geometry]'
-complete -c display -o respect-parentheses          -d 'Settings remain in effect until parenthesis boundary'
-complete -c display -o sampling-factor              -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c display -o seed                         -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c display -o set                          -d 'Set an image property [property value]'
-complete -c display -o size                         -d 'Width and height of image [geometry]'
-complete -c display -o texture                      -d 'Name of texture to tile onto the image background [filename]' -r
-complete -c display -o transparent-color            -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c display -o treedepth                    -d 'Color tree depth [value]'
-complete -c display -o update                       -d 'Seconds detect when image file is modified and redisplay'
-complete -c display -o verbose                      -d 'Print detailed information about the image'
-complete -c display -o visual                       -d 'Display image using this visual type [type]' -x
-complete -c display -o virtual-pixel                -d 'Virtual pixel access method [method]' -xa '(display -list virtual-pixel)'
-complete -c display -o window                       -d 'Display image to background of this window [id]' -xa 'root (__fish_print_xwindows)'
-complete -c display -o window-group                 -d 'Exit program when this window id is destroyed [id]'
-complete -c display -o write                        -d 'Write image to a file [filename]' -r
-complete -c display -o auto-orient                  -d 'Automagically orient image'
-complete -c display -o border                       -d 'Surround image with a border of color [geometry]'
-complete -c display -o clip                         -d 'Clip along the first path from the 8BIM profile'
-complete -c display -o clip-path                    -d 'Clip along a named path from the 8BIM profile [id]'
-complete -c display -o colors                       -d 'Preferred number of colors in the image [value]'
-complete -c display -o contrast                     -d 'Enhance or reduce the image contrast'
-complete -c display -o crop                         -d 'Preferred size and location of the cropped image [geometry]'
-complete -c display -o decipher                     -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c display -o deskew                       -d 'Straighten an image [threshold]'
-complete -c display -o despeckle                    -d 'Reduce the speckles within an image'
-complete -c display -o edge                         -d 'Apply a filter to detect edges in the image [factor]'
-complete -c display -o enhance                      -d 'Apply a digital filter to enhance a noisy image'
-complete -c display -o equalize                     -d 'Perform histogram equalization to an image'
-complete -c display -o extract                      -d 'Extract area from image [geometry]'
-complete -c display -o flip                         -d 'Flip image in the vertical direction'
-complete -c display -o flop                         -d 'Flop image in the horizontal direction'
-complete -c display -o frame                        -d 'Surround image with an ornamental border [geometry]'
-complete -c display -o fuzz                         -d 'Colors within this distance are considered equal [distance]'
-complete -c display -o gamma                        -d 'Level of gamma correction [value]'
-complete -c display -o monochrome                   -d 'Transform image to black and white'
-complete -c display -o negate                       -d 'Replace every pixel with its complementary color'
-complete -c display -o normalize                    -d 'Transform image to span the full range of colors'
-complete -c display -o raise                        -d 'Lighten/darken image edges to create a 3-D effect [value]'
-complete -c display -o resample                     -d 'Change the resolution of an image [geometry]'
-complete -c display -o resize                       -d 'Resize the image [geometry]'
-complete -c display -o roll                         -d 'Roll an image vertically or horizontally [geometry]'
-complete -c display -o rotate                       -d 'Apply Paeth rotation to the image [degrees]'
-complete -c display -o sample                       -d 'Scale image with pixel sampling [geometry]'
-complete -c display -o segment                      -d 'Segment an image [value]'
-complete -c display -o sharpen                      -d 'Sharpen the image [geometry]'
-complete -c display -o strip                        -d 'Strip image of all profiles and comments'
-complete -c display -o threshold                    -d 'Threshold the image [value]'
-complete -c display -o thumbnail                    -d 'Create a thumbnail of the image [geometry]'
-complete -c display -o trim                         -d 'Trim image edges'
-complete -c display -o coalesce                     -d 'Merge a sequence of images'
-complete -c display -o flatten                      -d 'Flatten a sequence of images'
-complete -c display -o debug                        -d 'Display copious debugging information [events]' -xa '(display -list debug)'
-complete -c display -o help                         -d 'Print program options'
-complete -c display -o list                         -d 'Print a list of supported option arguments [type]' -xa '(display -list list)'
-complete -c display -o log                          -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c display -o version                      -d 'Print version information'
-complete -c display -o matte                        -d 'Store matte channel if the image has one'
-complete -c display -o scenes                       -d 'Range image scene range'
-complete -c display -o support                      -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c display -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(display -list alpha)'
+complete -c display -o antialias -d 'Remove pixel-aliasing '
+complete -c display -o authenticate -d 'Decipher image with this password [password]'
+complete -c display -o backdrop -d 'Display image centered on a backdrop'
+complete -c display -o channel -d 'Apply option to select image channels [type]' -xa '(display -list channel)'
+complete -c display -o colormap -d 'Shared or Private [type]' -x
+complete -c display -o colorspace -d 'Alternate image colorspace [type]' -xa '(display -list colorspace)'
+complete -c display -o comment -d 'Annotate image with comment [string]'
+complete -c display -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(display -list compress)'
+complete -c display -o define -d 'Define one or more image format options [format:option]'
+complete -c display -o delay -d 'Display the next image after pausing [value]'
+complete -c display -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c display -o depth -d 'Image depth [value]'
+complete -c display -o display -d 'Display image to this X server [server]'
+complete -c display -o dispose -d 'Layer disposal method [method]' -xa '(display -list dispose)'
+complete -c display -o dither -d 'Apply error diffusion to image [method]' -xa '(display -list dither)'
+complete -c display -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(display -list endian)'
+complete -c display -o filter -d 'Use this filter when resizing an image [type]' -xa '(display -list filter)'
+complete -c display -o format -d 'Output formatted image characteristics [string]'
+complete -c display -o geometry -d 'Preferred size and location of the Image window [geometry]'
+complete -c display -o gravity -d 'Horizontal and vertical backdrop placement [type]' -xa '(display -list gravity)'
+complete -c display -o identify -d 'Identify the format and characteristics of the image'
+complete -c display -o immutable -d 'Displayed image cannot be modified'
+complete -c display -o interlace -d 'Type of image interlacing scheme [type]' -xa '(display -list interlace)'
+complete -c display -o interpolate -d 'Pixel color interpolation method [method]' -xa '(display -list interpolate)'
+complete -c display -o label -d 'Assign a label to an image [string]'
+complete -c display -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c display -o loop -d 'Loop images then exit [iterations]'
+complete -c display -o map -d 'Display image using this Standard Colormap [type]' -x
+complete -c display -o monitor -d 'Monitor progress '
+complete -c display -o page -d 'Size and location of an image canvas [geometry]'
+complete -c display -o profile -d 'Add, delete, or apply an image profile [filename]' -r
+complete -c display -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c display -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(display -list colorspace)'
+complete -c display -o quiet -d 'Suppress all warning messages'
+complete -c display -o regard-warnings -d 'Pay attention to warning messages'
+complete -c display -o remote -d 'Command execute a command in an remote display process'
+complete -c display -o repage -d 'Size and location of an image canvas (operator) [geometry]'
+complete -c display -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c display -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c display -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c display -o set -d 'Set an image property [property value]'
+complete -c display -o size -d 'Width and height of image [geometry]'
+complete -c display -o texture -d 'Name of texture to tile onto the image background [filename]' -r
+complete -c display -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c display -o treedepth -d 'Color tree depth [value]'
+complete -c display -o update -d 'Seconds detect when image file is modified and redisplay'
+complete -c display -o verbose -d 'Print detailed information about the image'
+complete -c display -o visual -d 'Display image using this visual type [type]' -x
+complete -c display -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(display -list virtual-pixel)'
+complete -c display -o window -d 'Display image to background of this window [id]' -xa 'root (__fish_print_xwindows)'
+complete -c display -o window-group -d 'Exit program when this window id is destroyed [id]'
+complete -c display -o write -d 'Write image to a file [filename]' -r
+complete -c display -o auto-orient -d 'Automagically orient image'
+complete -c display -o border -d 'Surround image with a border of color [geometry]'
+complete -c display -o clip -d 'Clip along the first path from the 8BIM profile'
+complete -c display -o clip-path -d 'Clip along a named path from the 8BIM profile [id]'
+complete -c display -o colors -d 'Preferred number of colors in the image [value]'
+complete -c display -o contrast -d 'Enhance or reduce the image contrast'
+complete -c display -o crop -d 'Preferred size and location of the cropped image [geometry]'
+complete -c display -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c display -o deskew -d 'Straighten an image [threshold]'
+complete -c display -o despeckle -d 'Reduce the speckles within an image'
+complete -c display -o edge -d 'Apply a filter to detect edges in the image [factor]'
+complete -c display -o enhance -d 'Apply a digital filter to enhance a noisy image'
+complete -c display -o equalize -d 'Perform histogram equalization to an image'
+complete -c display -o extract -d 'Extract area from image [geometry]'
+complete -c display -o flip -d 'Flip image in the vertical direction'
+complete -c display -o flop -d 'Flop image in the horizontal direction'
+complete -c display -o frame -d 'Surround image with an ornamental border [geometry]'
+complete -c display -o fuzz -d 'Colors within this distance are considered equal [distance]'
+complete -c display -o gamma -d 'Level of gamma correction [value]'
+complete -c display -o monochrome -d 'Transform image to black and white'
+complete -c display -o negate -d 'Replace every pixel with its complementary color'
+complete -c display -o normalize -d 'Transform image to span the full range of colors'
+complete -c display -o raise -d 'Lighten/darken image edges to create a 3-D effect [value]'
+complete -c display -o resample -d 'Change the resolution of an image [geometry]'
+complete -c display -o resize -d 'Resize the image [geometry]'
+complete -c display -o roll -d 'Roll an image vertically or horizontally [geometry]'
+complete -c display -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c display -o sample -d 'Scale image with pixel sampling [geometry]'
+complete -c display -o segment -d 'Segment an image [value]'
+complete -c display -o sharpen -d 'Sharpen the image [geometry]'
+complete -c display -o strip -d 'Strip image of all profiles and comments'
+complete -c display -o threshold -d 'Threshold the image [value]'
+complete -c display -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c display -o trim -d 'Trim image edges'
+complete -c display -o coalesce -d 'Merge a sequence of images'
+complete -c display -o flatten -d 'Flatten a sequence of images'
+complete -c display -o debug -d 'Display copious debugging information [events]' -xa '(display -list debug)'
+complete -c display -o help -d 'Print program options'
+complete -c display -o list -d 'Print a list of supported option arguments [type]' -xa '(display -list list)'
+complete -c display -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c display -o version -d 'Print version information'
+complete -c display -o matte -d 'Store matte channel if the image has one'
+complete -c display -o scenes -d 'Range image scene range'
+complete -c display -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
diff --git a/share/completions/dlocate.fish b/share/completions/dlocate.fish
index 7289bf971..035f67939 100644
--- a/share/completions/dlocate.fish
+++ b/share/completions/dlocate.fish
@@ -1,6 +1,6 @@
 
-complete -c dlocate -s S -x -d  'List records that match filenames'
-complete -c dlocate -s L  -d  'List all files in the package' -xa '(__fish_print_packages)'
+complete -c dlocate -s S -x -d 'List records that match filenames'
+complete -c dlocate -s L -d 'List all files in the package' -xa '(__fish_print_packages)'
 complete -c dlocate -o ls -d 'ls -ldF all files in the package' -xa '(__fish_print_packages)'
 complete -c dlocate -o du -d 'du -sck all files in the package' -xa '(__fish_print_packages)'
 
diff --git a/share/completions/dmesg.fish b/share/completions/dmesg.fish
index aa71bbdc8..9e111507d 100644
--- a/share/completions/dmesg.fish
+++ b/share/completions/dmesg.fish
@@ -1,51 +1,51 @@
 complete -c dmesg -f -d 'Display system message buffer'
 
 switch (uname -s)
-	#
-	# Solaris
-	#
-	case SunOS
-		exit 1 # no options, we are done
-	#
-	# Loonix dmesg
-	#
-	case Linux
-		set -l levels '( __fish_complete_list , "echo emerg\nalert\ncrit\nerr\nwarn\nnotice\ninfo\ndebug" )'
-		complete -c dmesg -s C -l clear               -f -d'Clear kernel ring buffer'
-		complete -c dmesg -s c -l read-clear          -f -d'Read & clear all msgs'
-		complete -c dmesg -s D -l console-off         -f -d'Disable writing to console'
-		complete -c dmesg -s d -l show-delta          -f -d'Show timestamp deltas'
-		complete -c dmesg -s E -l console-on          -f -d'Enable writing to console'
-		complete -c dmesg -s F -l file             -r    -d'Use file instead of log buffer'
-		complete -c dmesg -s f -l facility      -x       -d'Only print for given facilities' -a '( __fish_complete_list , "echo kern\nuser\nmail\ndaemon\nauth\nsyslog\nlpr\nnews" )'
-		complete -c dmesg -s h -l help                -f -d'Display help'
-		complete -c dmesg -s k -l kernel              -f -d'Print kernel messages'
-		complete -c dmesg -s l -l level         -x       -d'Restrict output to given levels' -a $levels
-		complete -c dmesg -s n -l console-level -x       -d'Adjust threshold to print to console' -a $levels
-		complete -c dmesg -s r -l raw                 -f -d'Print raw message buffer'
-		complete -c dmesg -s s -l buffer-size   -x       -d'Buffer size to query kernel'
-		complete -c dmesg -s T -l ctime               -f -d'Human-readable timestamps'
-		complete -c dmesg -s t -l notime              -f -d'Don\'t print timestamps'
-		complete -c dmesg -s u -l userspace           -f -d'Print userspace messages'
-		complete -c dmesg -s V -l version             -f -d'Show dmesg version'
-		complete -c dmesg -s x -l decode              -f -d'Decode facility & level numbers'
-		exit 0 # done
-	#
-	# unique options specific BSDs have
-	#
-	case NetBSD
-		complete -c dmesg -s d                        -f -d'show timestamp deltas'
-		complete -c dmesg -s T                        -f -d'human-readable timestamps'
-		complete -c dmesg -s t                        -f -d'don\'t print timestamps'
-	case OpenBSD
-		complete -c dmesg -s S                        -f -d'display console message buffer-size'
-	case FreeBSD DragonFly
-		complete -c dmesg -s a                        -f -d'print all data in the message buffer'
-		complete -c dmesg -s c                        -f -d'clear kernel buffer after printing'
+    #
+    # Solaris
+    #
+    case SunOS
+        exit 1 # no options, we are done
+        #
+        # Loonix dmesg
+        #
+    case Linux
+        set -l levels '( __fish_complete_list , "echo emerg\nalert\ncrit\nerr\nwarn\nnotice\ninfo\ndebug" )'
+        complete -c dmesg -s C -l clear -f -d'Clear kernel ring buffer'
+        complete -c dmesg -s c -l read-clear -f -d'Read & clear all msgs'
+        complete -c dmesg -s D -l console-off -f -d'Disable writing to console'
+        complete -c dmesg -s d -l show-delta -f -d'Show timestamp deltas'
+        complete -c dmesg -s E -l console-on -f -d'Enable writing to console'
+        complete -c dmesg -s F -l file -r -d'Use file instead of log buffer'
+        complete -c dmesg -s f -l facility -x -d'Only print for given facilities' -a '( __fish_complete_list , "echo kern\nuser\nmail\ndaemon\nauth\nsyslog\nlpr\nnews" )'
+        complete -c dmesg -s h -l help -f -d'Display help'
+        complete -c dmesg -s k -l kernel -f -d'Print kernel messages'
+        complete -c dmesg -s l -l level -x -d'Restrict output to given levels' -a $levels
+        complete -c dmesg -s n -l console-level -x -d'Adjust threshold to print to console' -a $levels
+        complete -c dmesg -s r -l raw -f -d'Print raw message buffer'
+        complete -c dmesg -s s -l buffer-size -x -d'Buffer size to query kernel'
+        complete -c dmesg -s T -l ctime -f -d'Human-readable timestamps'
+        complete -c dmesg -s t -l notime -f -d'Don\'t print timestamps'
+        complete -c dmesg -s u -l userspace -f -d'Print userspace messages'
+        complete -c dmesg -s V -l version -f -d'Show dmesg version'
+        complete -c dmesg -s x -l decode -f -d'Decode facility & level numbers'
+        exit 0 # done
+        #
+        # unique options specific BSDs have
+        #
+    case NetBSD
+        complete -c dmesg -s d -f -d'show timestamp deltas'
+        complete -c dmesg -s T -f -d'human-readable timestamps'
+        complete -c dmesg -s t -f -d'don\'t print timestamps'
+    case OpenBSD
+        complete -c dmesg -s S -f -d'display console message buffer-size'
+    case FreeBSD DragonFly
+        complete -c dmesg -s a -f -d'print all data in the message buffer'
+        complete -c dmesg -s c -f -d'clear kernel buffer after printing'
 end
 
 #
 # common BSD dmesg options (macOS only does these two)
 #
-complete 		 -c dmesg -s M                      -r   -d'get namelist values from given core'
-complete 		 -c dmesg -s N                      -r   -d'get namelist from given kernel'
+complete -c dmesg -s M -r -d'get namelist values from given core'
+complete -c dmesg -s N -r -d'get namelist from given kernel'
diff --git a/share/completions/dpkg-reconfigure.fish b/share/completions/dpkg-reconfigure.fish
index 8b1459bf5..2ddbdb6ab 100644
--- a/share/completions/dpkg-reconfigure.fish
+++ b/share/completions/dpkg-reconfigure.fish
@@ -3,7 +3,7 @@
 complete -f -c dpkg-reconfigure -a '(__fish_print_packages)' -d 'Package'
 
 # Support flags
-complete -x -f -c dpkg-reconfigure -s h -l help     -d 'Display help'
+complete -x -f -c dpkg-reconfigure -s h -l help -d 'Display help'
 
 # General options
 complete -f -c dpkg-reconfigure -s f -l frontend -r -a "dialog readline noninteractive gnome kde editor web" -d 'Set configuration frontend'
diff --git a/share/completions/dpkg.fish b/share/completions/dpkg.fish
index d60b6dbad..857085d21 100644
--- a/share/completions/dpkg.fish
+++ b/share/completions/dpkg.fish
@@ -1,19 +1,19 @@
 
-complete -c dpkg -s i -l install -d 'Install .deb package'     -xa '(__fish_complete_suffix .deb)'
-complete -c dpkg      -l unpack  -d 'Unpack .deb package'      -xa '(__fish_complete_suffix .deb)'
-complete -c dpkg      -l configure -d 'Configure package'      -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s r -l remove  -d 'Remove package'           -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s P -l purge   -d 'Purge package'            -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s V -l verify  -d 'Verify contents of package' -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -l force-all    -d 'Continue on all problems'
+complete -c dpkg -s i -l install -d 'Install .deb package' -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -l unpack -d 'Unpack .deb package' -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -l configure -d 'Configure package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s r -l remove -d 'Remove package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s P -l purge -d 'Purge package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s V -l verify -d 'Verify contents of package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -l force-all -d 'Continue on all problems'
 
 # dpkg-deb options
-complete -c dpkg -s b -l build    -d 'Build package from directory' -xa '(__fish_complete_directories (commandline -ct))'
-complete -c dpkg -s c -l contents -d 'List contents of .deb'        -xa '(__fish_complete_suffix .deb)'
-complete -c dpkg -s I -l info     -d 'Show .deb information'        -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -s b -l build -d 'Build package from directory' -xa '(__fish_complete_directories (commandline -ct))'
+complete -c dpkg -s c -l contents -d 'List contents of .deb' -xa '(__fish_complete_suffix .deb)'
+complete -c dpkg -s I -l info -d 'Show .deb information' -xa '(__fish_complete_suffix .deb)'
 
 # dpkg-query options
-complete -c dpkg -s l -l list      -d 'List packages matching pattern' -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s L -l listfiles -d 'List contents of packages'      -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s s -l status    -d 'Print status of package'        -xa '(dpkg-query -W -f \'${Package}\n\')'
-complete -c dpkg -s S -l search    -d 'Search for packages containing file'
+complete -c dpkg -s l -l list -d 'List packages matching pattern' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s L -l listfiles -d 'List contents of packages' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s s -l status -d 'Print status of package' -xa '(dpkg-query -W -f \'${Package}\n\')'
+complete -c dpkg -s S -l search -d 'Search for packages containing file'
diff --git a/share/completions/duply.fish b/share/completions/duply.fish
index 22eb046fc..c4884395a 100644
--- a/share/completions/duply.fish
+++ b/share/completions/duply.fish
@@ -4,24 +4,24 @@ complete --command duply --no-files --condition '__fish_is_first_token' --argume
 complete --command duply --no-files --arguments 'usage' -d 'Get usage help text'
 
 # Second parameter is a duply command
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'create'     -d 'Creates a configuration profile'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'backup'     -d 'Backup with pre/post script execution'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'bkp'        -d 'Backup without executing pre/post scripts'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'pre'        -d 'Execute <profile>/pre script'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'post'       -d 'Execute <profile>/post script'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'full'       -d 'Force full backup'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'incr'       -d 'Force incremental backup'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'list'       -d 'List all files in backup (as it was at <age>, default: now)'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'status'     -d 'Prints backup sets and chains currently in repository'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'verify'     -d 'List files changed since latest backup'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'purge'      -d 'Shows outdated backup archives [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'create' -d 'Creates a configuration profile'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'backup' -d 'Backup with pre/post script execution'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'bkp' -d 'Backup without executing pre/post scripts'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'pre' -d 'Execute <profile>/pre script'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'post' -d 'Execute <profile>/post script'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'full' -d 'Force full backup'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'incr' -d 'Force incremental backup'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'list' -d 'List all files in backup (as it was at <age>, default: now)'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'status' -d 'Prints backup sets and chains currently in repository'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'verify' -d 'List files changed since latest backup'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'purge' -d 'Shows outdated backup archives [--force, delete these files]'
 complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'purge-full' -d 'Shows outdated backups [--force, delete these files]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'cleanup'    -d 'Shows broken backup archives [--force, delete these files]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'restore'    -d 'Restore the backup to <target_path> [as it was at <age>]'
-complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'fetch'      -d 'Restore single file/folder from backup [as it was at <age>]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'cleanup' -d 'Shows broken backup archives [--force, delete these files]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'restore' -d 'Restore the backup to <target_path> [as it was at <age>]'
+complete --command duply --no-files --condition 'not __fish_is_first_token' --arguments 'fetch' -d 'Restore single file/folder from backup [as it was at <age>]'
 
 # Options
-complete --command duply --no-files --long-option force   -d 'Really execute the commands: purge, purge-full, cleanup'
+complete --command duply --no-files --long-option force -d 'Really execute the commands: purge, purge-full, cleanup'
 complete --command duply --no-files --long-option preview -d 'Do nothing but print out generated duplicity command lines'
 complete --command duply --no-files --long-option dry-run -d 'Calculate what would be done, but don''t perform any actions'
 complete --command duply --no-files --long-option allow-source-mismatch -d 'Don''t abort when backup different dirs to the same backend'
diff --git a/share/completions/ebuild.fish b/share/completions/ebuild.fish
index dd19665e7..b95f6b2fe 100644
--- a/share/completions/ebuild.fish
+++ b/share/completions/ebuild.fish
@@ -1,36 +1,36 @@
 function __fish_seen_ebuild_arg -d "Test if an ebuild-argument has been given in the current commandline"
-	commandline -opc | string match -q '*.ebuild'
+    commandline -opc | string match -q '*.ebuild'
 end
 
 ## Opts
-complete -c ebuild -l debug             -d "Run bash with the -x option"
-complete -c ebuild -l color             -d "Enable color" \
-	-xa "y n"
-complete -c ebuild -l force             -d "Force regeneration of digests"
+complete -c ebuild -l debug -d "Run bash with the -x option"
+complete -c ebuild -l color -d "Enable color" \
+    -xa "y n"
+complete -c ebuild -l force -d "Force regeneration of digests"
 complete -c ebuild -l ignore-default-opts -d "Ignore EBUILD_DEFAULT_OPTS"
-complete -c ebuild -l skip-manifest	-d "Skip all manifest checks"
+complete -c ebuild -l skip-manifest -d "Skip all manifest checks"
 
 ## Subcommands
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'help'        -d "Show help"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'pretend'     -d "Run pkg_pretend()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'setup'       -d "Run setup and system checks"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'clean'       -d "Clean build dir"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'fetch'       -d "Fetches all files from SRC_URI"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'help' -d "Show help"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'pretend' -d "Run pkg_pretend()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'setup' -d "Run setup and system checks"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'clean' -d "Clean build dir"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'fetch' -d "Fetches all files from SRC_URI"
 #complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'digest'      -d "Deprecared: see manifest"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'manifest'    -d "Update pkg manifest"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unpack'      -d "Extracts sources"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prepare'     -d "Run src_prepare()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'configure'   -d "Run src_configure()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'compile'     -d "Run src_compile()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'test'        -d "Run tests"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'preinst'     -d "Run pkg_preinst()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'install'     -d "Run src_install()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postinst'    -d "Run pkg_postinst()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'qmerge'      -d "Install files to live filesystem"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'merge'       -d "Run fetch, unpack, compile, install and qmerge"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unmerge'     -d "Uninstall files from live filesystem"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prerm'       -d "Run pkg_prerm()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postrm'      -d "Run pkg_postrm()"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'config'      -d "Run post-install configuration"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'package'     -d "Create a binpkg in PKGDIR"
-complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'rpm'         -d "Builds a RedHat RPM pkg"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'manifest' -d "Update pkg manifest"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unpack' -d "Extracts sources"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prepare' -d "Run src_prepare()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'configure' -d "Run src_configure()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'compile' -d "Run src_compile()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'test' -d "Run tests"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'preinst' -d "Run pkg_preinst()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'install' -d "Run src_install()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postinst' -d "Run pkg_postinst()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'qmerge' -d "Install files to live filesystem"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'merge' -d "Run fetch, unpack, compile, install and qmerge"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'unmerge' -d "Uninstall files from live filesystem"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'prerm' -d "Run pkg_prerm()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'postrm' -d "Run pkg_postrm()"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'config' -d "Run post-install configuration"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'package' -d "Create a binpkg in PKGDIR"
+complete -c ebuild -n '__fish_seen_ebuild_arg' -xa 'rpm' -d "Builds a RedHat RPM pkg"
diff --git a/share/completions/eix.fish b/share/completions/eix.fish
index a18e53b65..3910902b2 100644
--- a/share/completions/eix.fish
+++ b/share/completions/eix.fish
@@ -43,7 +43,7 @@ complete -c eix -s 2 -l slots -d "Match packages with two different slots"
 complete -c eix -s u -l update -d "Match packages without best slotted version"
 complete -c eix -s o -l overlay -d "Match packages from overlays"
 complete -c eix -s T -l test-obsolete -d "Match packages with obsolete entries"
-complete -c eix -s '!' -l not -d "Invert the expression (toggle)"
+complete -c eix -s ! -l not -d "Invert the expression (toggle)"
 complete -c eix -s '|' -l pipe -d "Use input from pipe of emerge -pv"
 ###
 # Search Fields
diff --git a/share/completions/elixir.fish b/share/completions/elixir.fish
index f59045860..eedec7175 100644
--- a/share/completions/elixir.fish
+++ b/share/completions/elixir.fish
@@ -1,15 +1,15 @@
-complete -f -c elixir -s v        -d "Prints version and exit"
-complete -f -c elixir -s e        -d "Evaluates the given command"
-complete    -c elixir -s r        -d "Requires the given files/patterns"
-complete    -c elixir -s S        -d "Finds and executes the given script"
-complete    -c elixir -s pr       -d "Requires the given files/patterns in parallel"
-complete    -c elixir -s pa       -d "Prepends the given path to Erlang code path"
-complete    -c elixir -s pz       -d "Appends the given path to Erlang code path"
-complete    -c elixir -l app      -d "Start the given app and its dependencies"
-complete -f -c elixir -l erl      -d "Switches to be passed down to erlang"
-complete -f -c elixir -l name     -d "Makes and assigns a name to the distributed node"
-complete -f -c elixir -l sname    -d "Makes and assigns a short name to the distributed node"
-complete -f -c elixir -l cookie   -d "Sets a cookie for this distributed node"
-complete -f -c elixir -l hidden   -d "Makes a hidden node"
+complete -f -c elixir -s v -d "Prints version and exit"
+complete -f -c elixir -s e -d "Evaluates the given command"
+complete -c elixir -s r -d "Requires the given files/patterns"
+complete -c elixir -s S -d "Finds and executes the given script"
+complete -c elixir -s pr -d "Requires the given files/patterns in parallel"
+complete -c elixir -s pa -d "Prepends the given path to Erlang code path"
+complete -c elixir -s pz -d "Appends the given path to Erlang code path"
+complete -c elixir -l app -d "Start the given app and its dependencies"
+complete -f -c elixir -l erl -d "Switches to be passed down to erlang"
+complete -f -c elixir -l name -d "Makes and assigns a name to the distributed node"
+complete -f -c elixir -l sname -d "Makes and assigns a short name to the distributed node"
+complete -f -c elixir -l cookie -d "Sets a cookie for this distributed node"
+complete -f -c elixir -l hidden -d "Makes a hidden node"
 complete -f -c elixir -l detached -d "Starts the Erlang VM detached from console"
-complete -f -c elixir -l no-halt  -d "Does not halt the Erlang VM after execution"
+complete -f -c elixir -l no-halt -d "Does not halt the Erlang VM after execution"
diff --git a/share/completions/emaint.fish b/share/completions/emaint.fish
index 8aecefc91..547fe0a48 100644
--- a/share/completions/emaint.fish
+++ b/share/completions/emaint.fish
@@ -1,32 +1,32 @@
 ## Global Opts
-complete -c emaint -s h -l help         -d "Show this help message and exit"
-complete -c emaint -s c -l check        -d "Check for problems"
-complete -c emaint      -l version      -d "Show program's version number and exit"
-complete -c emaint -s f -l fix          -d "Attempt to fix problems"
-complete -c emaint -s P -l purge        -d "Remove the list of failed merges"
+complete -c emaint -s h -l help -d "Show this help message and exit"
+complete -c emaint -s c -l check -d "Check for problems"
+complete -c emaint -l version -d "Show program's version number and exit"
+complete -c emaint -s f -l fix -d "Attempt to fix problems"
+complete -c emaint -s P -l purge -d "Remove the list of failed merges"
 
 ## Subcommands
-complete -c emaint -n '__fish_use_subcommand' -xa 'all'         -d 'Perform all supported commands'
-complete -c emaint -n '__fish_use_subcommand' -xa 'binhost'     -d 'Scan and generate metadata indexes for binary pkgs'
+complete -c emaint -n '__fish_use_subcommand' -xa 'all' -d 'Perform all supported commands'
+complete -c emaint -n '__fish_use_subcommand' -xa 'binhost' -d 'Scan and generate metadata indexes for binary pkgs'
 complete -c emaint -n '__fish_use_subcommand' -xa 'cleanconfmem' -d 'Check and clean the config tracker list for uninstalled pkgs'
 complete -c emaint -n '__fish_use_subcommand' -xa 'cleanresume' -d 'Discard emerge --resume merge lists'
-complete -c emaint -n '__fish_use_subcommand' -xa 'logs'        -d 'Check and clean old logs in the PORT_LOGDIR'
-complete -c emaint -n '__fish_use_subcommand' -xa 'merges'      -d 'Scan for failed merges and fix them'
-complete -c emaint -n '__fish_use_subcommand' -xa 'movebin'     -d 'Perform pkg move updates for binary pkgs'
-complete -c emaint -n '__fish_use_subcommand' -xa 'moveinst'    -d 'Perform pkg move updates for installed and binary pkgs'
-complete -c emaint -n '__fish_use_subcommand' -xa 'sync'        -d 'Check repos.conf settings and sync repositories'
-complete -c emaint -n '__fish_use_subcommand' -xa 'world'       -d 'Check and fix problems in the world file'
+complete -c emaint -n '__fish_use_subcommand' -xa 'logs' -d 'Check and clean old logs in the PORT_LOGDIR'
+complete -c emaint -n '__fish_use_subcommand' -xa 'merges' -d 'Scan for failed merges and fix them'
+complete -c emaint -n '__fish_use_subcommand' -xa 'movebin' -d 'Perform pkg move updates for binary pkgs'
+complete -c emaint -n '__fish_use_subcommand' -xa 'moveinst' -d 'Perform pkg move updates for installed and binary pkgs'
+complete -c emaint -n '__fish_use_subcommand' -xa 'sync' -d 'Check repos.conf settings and sync repositories'
+complete -c emaint -n '__fish_use_subcommand' -xa 'world' -d 'Check and fix problems in the world file'
 
 ## Local opts
 # logs
-complete -c emaint -n '__fish_seen_subcommand_from logs' -s t -l time      -d "Delete logs older than NUM days" \
-	-xa "(seq 0 365)"
-complete -c emaint -n '__fish_seen_subcommand_from logs' -s p -l pretend   -d "Output logs that would be deleted"
-complete -c emaint -n '__fish_seen_subcommand_from logs' -s C -l clean     -d "Cleans out logs more than 7 days old"
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s t -l time -d "Delete logs older than NUM days" \
+    -xa "(seq 0 365)"
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s p -l pretend -d "Output logs that would be deleted"
+complete -c emaint -n '__fish_seen_subcommand_from logs' -s C -l clean -d "Cleans out logs more than 7 days old"
 # sync
-complete -c emaint -n '__fish_seen_subcommand_from sync' -s a -l auto          	-d "Sync auto-sync enabled repos only"
-complete -c emaint -n '__fish_seen_subcommand_from sync' -s A -l allrepos      	-d "Sync all repos that have a sync-url defined"
-complete -c emaint -n '__fish_seen_subcommand_from sync' -s r -l repo          	-d "Sync the specified repo" \
-	-xa "(__fish_portage_print_repository_names)"
-complete -c emaint -n '__fish_seen_subcommand_from sync'      -l sync-submodule -d "Restrict sync to the specified submodule(s)" \
-	-xa "glsa news profiles"
+complete -c emaint -n '__fish_seen_subcommand_from sync' -s a -l auto -d "Sync auto-sync enabled repos only"
+complete -c emaint -n '__fish_seen_subcommand_from sync' -s A -l allrepos -d "Sync all repos that have a sync-url defined"
+complete -c emaint -n '__fish_seen_subcommand_from sync' -s r -l repo -d "Sync the specified repo" \
+    -xa "(__fish_portage_print_repository_names)"
+complete -c emaint -n '__fish_seen_subcommand_from sync' -l sync-submodule -d "Restrict sync to the specified submodule(s)" \
+    -xa "glsa news profiles"
diff --git a/share/completions/emerge.fish b/share/completions/emerge.fish
index 182654654..e02dca4f0 100644
--- a/share/completions/emerge.fish
+++ b/share/completions/emerge.fish
@@ -13,40 +13,40 @@
 #end
 
 function __fish_emerge_print_sets
-	for s in '@'(emerge --list-sets)
-		switch $s
-		case @profile
-			printf '%s\t%s\n' $s 'set of packages deemed necessary for your system to run properly'
-		case @selected-packages
-			printf '%s\t%s\n' $s 'packages listed in /var/lib/portage/world'
-		case @selected-sets
-			printf '%s\t%s\n' $s 'sets listed in /var/lib/portage/world_sets'
-		case @selected
-			printf '%s\t%s\n' $s 'encompasses both the selected-packages and selected-sets sets'
-		case @system
-			printf '%s\t%s\n' $s 'set of packages deemed necessary for your system to run properly'
-		case @world
-			printf '%s\t%s\n' $s 'encompasses the selected, system and profile sets'
-		case '*'
-			echo $s
-		end
-	end
+    for s in '@'(emerge --list-sets)
+        switch $s
+            case @profile
+                printf '%s\t%s\n' $s 'set of packages deemed necessary for your system to run properly'
+            case @selected-packages
+                printf '%s\t%s\n' $s 'packages listed in /var/lib/portage/world'
+            case @selected-sets
+                printf '%s\t%s\n' $s 'sets listed in /var/lib/portage/world_sets'
+            case @selected
+                printf '%s\t%s\n' $s 'encompasses both the selected-packages and selected-sets sets'
+            case @system
+                printf '%s\t%s\n' $s 'set of packages deemed necessary for your system to run properly'
+            case @world
+                printf '%s\t%s\n' $s 'encompasses the selected, system and profile sets'
+            case '*'
+                echo $s
+        end
+    end
 end
 
 # TODO <ebuild|tbz2file|file|@set|atom>...
 function __fish_emerge_possible_args
-	if __fish_contains_opt check-news -s h help list-sets metadata regen -s r resume \
-			-s s search -s S searchdesc sync -s V version
-		return
-	# TODO deselect=y
-	else if __fish_contains_opt config -s c depclean info -s P prune -s C unmerge
-		__fish_emerge_print_sets
-		__fish_portage_print_installed_pkgs
-	# TODO deselect=n
-	else
-		__fish_emerge_print_sets
-		__fish_portage_print_available_pkgs
-	end
+    if __fish_contains_opt check-news -s h help list-sets metadata regen -s r resume \
+            -s s search -s S searchdesc sync -s V version
+        return
+        # TODO deselect=y
+    else if __fish_contains_opt config -s c depclean info -s P prune -s C unmerge
+        __fish_emerge_print_sets
+        __fish_portage_print_installed_pkgs
+        # TODO deselect=n
+    else
+        __fish_emerge_print_sets
+        __fish_portage_print_available_pkgs
+    end
 end
 
 complete -c emerge -xa "(__fish_emerge_possible_args)"
@@ -54,30 +54,30 @@ complete -c emerge -xa "(__fish_emerge_possible_args)"
 #########################
 # Actions               #
 #########################
-complete -c emerge      -l check-news
-complete -c emerge      -l clean
-complete -c emerge      -l config
+complete -c emerge -l check-news
+complete -c emerge -l clean
+complete -c emerge -l config
 complete -c emerge -s c -l depclean
-complete -c emerge      -l deselect
+complete -c emerge -l deselect
 complete -c emerge -s h -l help
-complete -c emerge      -l info
-complete -c emerge      -l list-sets
-complete -c emerge      -l metadata
+complete -c emerge -l info
+complete -c emerge -l list-sets
+complete -c emerge -l metadata
 complete -c emerge -s P -l prune
-complete -c emerge      -l regen
+complete -c emerge -l regen
 complete -c emerge -s r -l resume
 complete -c emerge -s s -l search
 complete -c emerge -s S -l searchdesc
-complete -c emerge      -l sync
+complete -c emerge -l sync
 complete -c emerge -s C -l unmerge
 complete -c emerge -s V -l version
 
 #########################
 # Options               #
 #########################
-complete -c emerge -s A -l alert        -d "Add a terminal bell character ('\a') to all interactive prompts"
+complete -c emerge -s A -l alert -d "Add a terminal bell character ('\a') to all interactive prompts"
 #complete -c emerge      -l alphabetical -d "Sort flag lists alphabetically"
-complete -c emerge -s a -l ask          -d "Prompt the user before peforming the merge"
+complete -c emerge -s a -l ask -d "Prompt the user before peforming the merge"
 # ask-enter-invalid
 # autounmask
 # autounmask-backtrack <yn>
@@ -87,58 +87,58 @@ complete -c emerge -s a -l ask          -d "Prompt the user before peforming the
 # autounmask-keep-keywords
 # autounmask-keep-masks
 # autounmask-write
-complete -c emerge      -l backtrack
-complete -c emerge -s b -l buildpkg     -d "Build a binary pkg additionally"
+complete -c emerge -l backtrack
+complete -c emerge -s b -l buildpkg -d "Build a binary pkg additionally"
 # buildpkg-exclude
 complete -c emerge -s B -l buildpkgonly -d "Only build a binary pkg"
 # changed-deps
 complete -c emerge -s U -l changed-use
-complete -c emerge -s l -l changelog    -d "Show changelog of pkg. Use with --pretend"
-complete -c emerge      -l color        -d "Colorized output" \
-	-xa "y n"
-complete -c emerge      -l columns      -d "Align output. Use with --pretend"
-complete -c emerge      -l complete-graph
+complete -c emerge -s l -l changelog -d "Show changelog of pkg. Use with --pretend"
+complete -c emerge -l color -d "Colorized output" \
+    -xa "y n"
+complete -c emerge -l columns -d "Align output. Use with --pretend"
+complete -c emerge -l complete-graph
 # complete-graph-if-new-use <yn>
 # complete-graph-if-new-ver <yn>
 # config-root DIR
-complete -c emerge -s d -l debug        -d "Run in debug mode"
-complete -c emerge -s D -l deep         -d "Consider the whole dependency tree"
+complete -c emerge -s d -l debug -d "Run in debug mode"
+complete -c emerge -s D -l deep -d "Consider the whole dependency tree"
 # depclean-lib-check
 # digest
 # dynamic-deps <yn>
-complete -c emerge -s e -l emptytree    -d "Reinstall all world pkgs"
+complete -c emerge -s e -l emptytree -d "Reinstall all world pkgs"
 # exclude ATOMS
-complete -c emerge      -l exclude
+complete -c emerge -l exclude
 # fail-clean
-complete -c emerge -s f -l fetchonly    -d "Only download the pkgs but don't install them"
-complete -c emerge -s F -l fetch-all-uri        -d "Same as --fetchonly and grab all potential files"
+complete -c emerge -s f -l fetchonly -d "Only download the pkgs but don't install them"
+complete -c emerge -s F -l fetch-all-uri -d "Same as --fetchonly and grab all potential files"
 # fuzzy-search
-complete -c emerge -s g -l getbinpkg    -d "Download infos from each binary pkg. Implies -k"
-complete -c emerge -s G -l getbinpkgonly        -d "As -g but don't use local infos"
-complete -c emerge      -l ignore-default-opts  -d "Ignore EMERGE_DEFAULT_OPTS"
+complete -c emerge -s g -l getbinpkg -d "Download infos from each binary pkg. Implies -k"
+complete -c emerge -s G -l getbinpkgonly -d "As -g but don't use local infos"
+complete -c emerge -l ignore-default-opts -d "Ignore EMERGE_DEFAULT_OPTS"
 # ignore-build-slot-operator-deps <yn>
 # ignore-soname-deps <yn>
-complete -c emerge      -l jobs
-complete -c emerge      -l keep-going
+complete -c emerge -l jobs
+complete -c emerge -l keep-going
 # load-average
 # misspell-suggestion
 # newrepo
-complete -c emerge -s N -l newuse       -d "Include installed pkgs with changed USE flags"
-complete -c emerge      -l noconfmem    -d "Disregard merge records"
-complete -c emerge -s O -l nodeps       -d "Don't merge dependencies"
-complete -c emerge -s n -l noreplace    -d "Skip already installed pkgs"
-complete -c emerge      -l nospinner    -d "Disable the spinner"
+complete -c emerge -s N -l newuse -d "Include installed pkgs with changed USE flags"
+complete -c emerge -l noconfmem -d "Disregard merge records"
+complete -c emerge -s O -l nodeps -d "Don't merge dependencies"
+complete -c emerge -s n -l noreplace -d "Skip already installed pkgs"
+complete -c emerge -l nospinner -d "Disable the spinner"
 # usepkg-exclude ATOMS
 # rebuild-exclude ATOMS
 # rebuild-ignore ATOMS
-complete -c emerge -s 1 -l oneshot      -d "Don't add pkgs to world"
-complete -c emerge -s o -l onlydeps     -d "Only merge dependencies"
+complete -c emerge -s 1 -l oneshot -d "Don't add pkgs to world"
+complete -c emerge -s o -l onlydeps -d "Only merge dependencies"
 # onlydeps-with-rdeps <yn>
 # package-moves
 # pkg-format
 # prefix DIR
-complete -c emerge -s p -l pretend      -d "Display what would be done without doing it"
-complete -c emerge -s q -l quiet        -d "Use a condensed output"
+complete -c emerge -s p -l pretend -d "Display what would be done without doing it"
+complete -c emerge -s q -l quiet -d "Use a condensed output"
 # quiet-build
 # quiet-fail
 # quiet-repo-display
@@ -158,19 +158,19 @@ complete -c emerge -s q -l quiet        -d "Use a condensed output"
 # search-similarity PERCENTAGE
 complete -c emerge -s w -l select
 # selective
-complete -c emerge      -l skipfirst    -d "Remove first pkg in resume list. Use with --resume"
+complete -c emerge -l skipfirst -d "Remove first pkg in resume list. Use with --resume"
 # sync-module <glsa|news|profiles>
-complete -c emerge -s t -l tree         -d "Show the dependency tree"
+complete -c emerge -s t -l tree -d "Show the dependency tree"
 # unordered-display
 complete -c emerge -s u -l update
 # use-ebuild-visibility
 # useoldpkg-atoms ATOMS
-complete -c emerge -s k -l usepkg       -d "Use binary pkg if available"
-complete -c emerge -s K -l usepkgonly   -d "Only use binary pkgs"
-complete -c emerge -s v -l verbose      -d "Run in verbose mode"
-complete -c emerge      -l verbose-conflicts -d "Verbose slot conflicts"
+complete -c emerge -s k -l usepkg -d "Use binary pkg if available"
+complete -c emerge -s K -l usepkgonly -d "Only use binary pkgs"
+complete -c emerge -s v -l verbose -d "Run in verbose mode"
+complete -c emerge -l verbose-conflicts -d "Verbose slot conflicts"
 # verbose-slot-rebuilds
-complete -c emerge      -l with-bdeps   -d "Pull in build time dependencies" \
-	-xa "y n"
+complete -c emerge -l with-bdeps -d "Pull in build time dependencies" \
+    -xa "y n"
 # with-bdeps-auto <yn>
 # with-test-bdeps
diff --git a/share/completions/entr.fish b/share/completions/entr.fish
index 88a672351..4d70b65a0 100644
--- a/share/completions/entr.fish
+++ b/share/completions/entr.fish
@@ -1,5 +1,5 @@
-complete -c entr  -s r                     -d 'Launches the utility at startup and reloads it if one of the source files change'
-complete -c entr  -s c                     -d 'Clears the screen before running the utility'
-complete -c entr  -s h -l help             -d 'Display help and exit'
-complete -c entr  -s v -l version          -d 'Output version information'
-complete -c entr  -x -a '(__fish_complete_subcommand)'
+complete -c entr -s r -d 'Launches the utility at startup and reloads it if one of the source files change'
+complete -c entr -s c -d 'Clears the screen before running the utility'
+complete -c entr -s h -l help -d 'Display help and exit'
+complete -c entr -s v -l version -d 'Output version information'
+complete -c entr -x -a '(__fish_complete_subcommand)'
diff --git a/share/completions/epkginfo.fish b/share/completions/epkginfo.fish
index 4d766c555..dfa0b596f 100644
--- a/share/completions/epkginfo.fish
+++ b/share/completions/epkginfo.fish
@@ -1,12 +1,12 @@
 complete -c epkginfo -xa "(__fish_portage_print_available_pkgs)"
 ## Opts
-complete -c epkginfo -s h -l help               -d "display help"
-complete -c epkginfo -s d -l description        -d "extended pkg description"
-complete -c epkginfo -s H -l herd               -d "herd(s) for the pkg"
-complete -c epkginfo -s k -l keywords           -d "keywords for all matching pkg versions"
-complete -c epkginfo -s l -l license            -d "licenses for the best maching version"
-complete -c epkginfo -s m -l maintainer         -d "maintainer(s) for the pkg"
-complete -c epkginfo -s S -l stablreq           -d "STABLEREQ arches (cc's) for all matching pkg versio"
-complete -c epkginfo -s u -l useflags           -d "per-pkg USE flag descriptions"
-complete -c epkginfo -s U -l upstream           -d "pkg's upstream information"
-complete -c epkginfo -s x -l xml                -d "plain metadata.xml file"
+complete -c epkginfo -s h -l help -d "display help"
+complete -c epkginfo -s d -l description -d "extended pkg description"
+complete -c epkginfo -s H -l herd -d "herd(s) for the pkg"
+complete -c epkginfo -s k -l keywords -d "keywords for all matching pkg versions"
+complete -c epkginfo -s l -l license -d "licenses for the best maching version"
+complete -c epkginfo -s m -l maintainer -d "maintainer(s) for the pkg"
+complete -c epkginfo -s S -l stablreq -d "STABLEREQ arches (cc's) for all matching pkg versio"
+complete -c epkginfo -s u -l useflags -d "per-pkg USE flag descriptions"
+complete -c epkginfo -s U -l upstream -d "pkg's upstream information"
+complete -c epkginfo -s x -l xml -d "plain metadata.xml file"
diff --git a/share/completions/equery.fish b/share/completions/equery.fish
index bbedc0ce6..4c2878c36 100644
--- a/share/completions/equery.fish
+++ b/share/completions/equery.fish
@@ -1,134 +1,134 @@
 # TODO unused
 function __fish_equery_print_format
-	printf "%s\t%s\n" \
-		'$cp'           "Category and package name (e.g 'app-portage/gentoolkit')" \
-		'$cpv'          "Category, package name and version (e.g. 'app-portage/gentoolkit-0.3.0_rc10-r1')" \
-		'$category'     "Category (e.g. 'app-portage')" \
-		'$name'         "Package name (e.g. 'gentoolkit')" \
-		'$version'      "Version (without the revision) (e.g. '0.3.0_rc10')" \
-		'$revision'     "Revision (e.g. 'r1')" \
-		'$fullversion'  "Version including revision (e.g. '0.3.0_rc10-r1')" \
-		'$slot'         "Slot" \
-		'$repo'         "Repository (e.g. 'gentoo')" \
-		'$mask'         "Mask-status field (~M-??)" \
-		'$mask2'        "Verbose description of the masking status" \
-		'$location'     "Location field (IPO-)"
+    printf "%s\t%s\n" \
+        '$cp' "Category and package name (e.g 'app-portage/gentoolkit')" \
+        '$cpv' "Category, package name and version (e.g. 'app-portage/gentoolkit-0.3.0_rc10-r1')" \
+        '$category' "Category (e.g. 'app-portage')" \
+        '$name' "Package name (e.g. 'gentoolkit')" \
+        '$version' "Version (without the revision) (e.g. '0.3.0_rc10')" \
+        '$revision' "Revision (e.g. 'r1')" \
+        '$fullversion' "Version including revision (e.g. '0.3.0_rc10-r1')" \
+        '$slot' "Slot" \
+        '$repo' "Repository (e.g. 'gentoo')" \
+        '$mask' "Mask-status field (~M-??)" \
+        '$mask2' "Verbose description of the masking status" \
+        '$location' "Location field (IPO-)"
 end
 
 ## Global Opts
-complete -c equery -s h -l help         -d "Displays a help message"
-complete -c equery -s q -l quiet        -d "Minimal output"
-complete -c equery -s C -l no-color     -d "Turns off colors"
-complete -c equery -s N -l no-pipe      -d "Turns off pipe detection"
-complete -c equery -s V -l version      -d "Display version information"
+complete -c equery -s h -l help -d "Displays a help message"
+complete -c equery -s q -l quiet -d "Minimal output"
+complete -c equery -s C -l no-color -d "Turns off colors"
+complete -c equery -s N -l no-pipe -d "Turns off pipe detection"
+complete -c equery -s V -l version -d "Display version information"
 
 ## Subcommands
-complete -c equery -n '__fish_use_subcommand' -xa 'belongs'     -d "List all pkgs owning file(s)"
-complete -c equery -n '__fish_use_subcommand' -xa 'changes'     -d "List changelog entries for ATOM"
-complete -c equery -n '__fish_use_subcommand' -xa 'check'       -d "Check pkg's MD5sums and timestamps"
-complete -c equery -n '__fish_use_subcommand' -xa 'depends'     -d "List all pkgs depending on specified pkg"
-complete -c equery -n '__fish_use_subcommand' -xa 'depgraph'    -d "Display pkg's dependency tree"
-complete -c equery -n '__fish_use_subcommand' -xa 'files'       -d "List files owned by pkg"
-complete -c equery -n '__fish_use_subcommand' -xa 'has'         -d "List pkgs for matching ENVIRONMENT data"
-complete -c equery -n '__fish_use_subcommand' -xa 'hasuse'      -d "List pkgs with specified useflag"
-complete -c equery -n '__fish_use_subcommand' -xa 'keywords'    -d "Display pkg's keywords"
-complete -c equery -n '__fish_use_subcommand' -xa 'list'        -d "List all pkgs matching pattern"
-complete -c equery -n '__fish_use_subcommand' -xa 'meta'        -d "Display pkg's metadata"
-complete -c equery -n '__fish_use_subcommand' -xa 'size'        -d "Print size of files contained in pkg"
-complete -c equery -n '__fish_use_subcommand' -xa 'uses'        -d "Display pkg's USE flags"
-complete -c equery -n '__fish_use_subcommand' -xa 'which'       -d "Print full path to ebuild for pkg"
+complete -c equery -n '__fish_use_subcommand' -xa 'belongs' -d "List all pkgs owning file(s)"
+complete -c equery -n '__fish_use_subcommand' -xa 'changes' -d "List changelog entries for ATOM"
+complete -c equery -n '__fish_use_subcommand' -xa 'check' -d "Check pkg's MD5sums and timestamps"
+complete -c equery -n '__fish_use_subcommand' -xa 'depends' -d "List all pkgs depending on specified pkg"
+complete -c equery -n '__fish_use_subcommand' -xa 'depgraph' -d "Display pkg's dependency tree"
+complete -c equery -n '__fish_use_subcommand' -xa 'files' -d "List files owned by pkg"
+complete -c equery -n '__fish_use_subcommand' -xa 'has' -d "List pkgs for matching ENVIRONMENT data"
+complete -c equery -n '__fish_use_subcommand' -xa 'hasuse' -d "List pkgs with specified useflag"
+complete -c equery -n '__fish_use_subcommand' -xa 'keywords' -d "Display pkg's keywords"
+complete -c equery -n '__fish_use_subcommand' -xa 'list' -d "List all pkgs matching pattern"
+complete -c equery -n '__fish_use_subcommand' -xa 'meta' -d "Display pkg's metadata"
+complete -c equery -n '__fish_use_subcommand' -xa 'size' -d "Print size of files contained in pkg"
+complete -c equery -n '__fish_use_subcommand' -xa 'uses' -d "Display pkg's USE flags"
+complete -c equery -n '__fish_use_subcommand' -xa 'which' -d "Print full path to ebuild for pkg"
 
 ## Arguments
 complete -c equery -n '__fish_seen_subcommand_from c changes d depends g depgraph y keywords m meta u uses w which' \
-	-xa '(__fish_portage_print_available_pkgs)'
+    -xa '(__fish_portage_print_available_pkgs)'
 complete -c equery -n '__fish_seen_subcommand_from k check f files s size' \
-	-xa '(__fish_portage_print_installed_pkgs)'
+    -xa '(__fish_portage_print_installed_pkgs)'
 
 ## Local opts
 # belongs
-complete -c equery -n '__fish_seen_subcommand_from b belongs' -s f -l full-regex        -d "Query is a regex"
-complete -c equery -n '__fish_seen_subcommand_from b belongs' -s e -l early-out         -d "Stop after first match"
-complete -c equery -n '__fish_seen_subcommand_from b belongs' -s n -l name-only         -d "Omit version"
+complete -c equery -n '__fish_seen_subcommand_from b belongs' -s f -l full-regex -d "Query is a regex"
+complete -c equery -n '__fish_seen_subcommand_from b belongs' -s e -l early-out -d "Stop after first match"
+complete -c equery -n '__fish_seen_subcommand_from b belongs' -s n -l name-only -d "Omit version"
 
 # changes
-complete -c equery -n '__fish_seen_subcommand_from c changes' -s l -l latest            -d "Display only latest ChangeLog entry"
-complete -c equery -n '__fish_seen_subcommand_from c changes' -s f -l full              -d "Display full ChangeLog"
-complete -c equery -n '__fish_seen_subcommand_from c changes'      -l limit             -d "Limit number of entries displayed (with --full)" \
-	-xa "(seq 99)"
+complete -c equery -n '__fish_seen_subcommand_from c changes' -s l -l latest -d "Display only latest ChangeLog entry"
+complete -c equery -n '__fish_seen_subcommand_from c changes' -s f -l full -d "Display full ChangeLog"
+complete -c equery -n '__fish_seen_subcommand_from c changes' -l limit -d "Limit number of entries displayed (with --full)" \
+    -xa "(seq 99)"
 #complete -c equery -n '__fish_seen_subcommand_from c changes'      -l from=VER          -d "Set which version to display from"
 #complete -c equery -n '__fish_seen_subcommand_from c changes'      -l to=VER            -d "Set which version to display to"
 
 # check
-complete -c equery -n '__fish_seen_subcommand_from k check' -s f -l full-regex        -d "Query is a regex"
-complete -c equery -n '__fish_seen_subcommand_from k check' -s o -l only-failures     -d "Only display pkgs that do not pass"
+complete -c equery -n '__fish_seen_subcommand_from k check' -s f -l full-regex -d "Query is a regex"
+complete -c equery -n '__fish_seen_subcommand_from k check' -s o -l only-failures -d "Only display pkgs that do not pass"
 
 # depends
-complete -c equery -n '__fish_seen_subcommand_from d depends' -s a -l all-packages      -d "Include dependencies that are not installed (slow)"
-complete -c equery -n '__fish_seen_subcommand_from d depends' -s D -l indirect          -d "Search both direct and indirect dependencies"
-complete -c equery -n '__fish_seen_subcommand_from d depends'      -l depth             -d "Limit indirect dependency tree to specified depth" \
-	-xa "(seq 9)"
+complete -c equery -n '__fish_seen_subcommand_from d depends' -s a -l all-packages -d "Include dependencies that are not installed (slow)"
+complete -c equery -n '__fish_seen_subcommand_from d depends' -s D -l indirect -d "Search both direct and indirect dependencies"
+complete -c equery -n '__fish_seen_subcommand_from d depends' -l depth -d "Limit indirect dependency tree to specified depth" \
+    -xa "(seq 9)"
 
 # depgraph
-complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s A -l no-atom           -d "Don't show dependency atom"
-complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s M -l no-mask           -d "Don't show masking status"
-complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s U -l no-useflags       -d "Don't show USE flags"
-complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s l -l linear            -d "Don't indent dependencies"
-complete -c equery -n '__fish_seen_subcommand_from g depgraph'      -l depth             -d "Limit dependency graph to specified depth" \
-	-xa "(seq 9)"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s A -l no-atom -d "Don't show dependency atom"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s M -l no-mask -d "Don't show masking status"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s U -l no-useflags -d "Don't show USE flags"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -s l -l linear -d "Don't indent dependencies"
+complete -c equery -n '__fish_seen_subcommand_from g depgraph' -l depth -d "Limit dependency graph to specified depth" \
+    -xa "(seq 9)"
 
 # files
 function __fish_equery_files_filter_args
-	printf "%s\n" dir obj sym dev fifo path conf cmd doc man info
+    printf "%s\n" dir obj sym dev fifo path conf cmd doc man info
 end
-complete -c equery -n '__fish_seen_subcommand_from f files' -s m -l md5sum            -d "Include MD5 sum in output"
-complete -c equery -n '__fish_seen_subcommand_from f files' -s s -l timestamp         -d "Include timestamp in output"
-complete -c equery -n '__fish_seen_subcommand_from f files' -s t -l type              -d "Include file type in output"
-complete -c equery -n '__fish_seen_subcommand_from f files'      -l tree              -d "Display results in a tree"
-complete -c equery -n '__fish_seen_subcommand_from f files' -s f -l filter            -d "Filter output by file type" \
-	-xa "(__fish_complete_list , __fish_equery_files_filter_args)"
+complete -c equery -n '__fish_seen_subcommand_from f files' -s m -l md5sum -d "Include MD5 sum in output"
+complete -c equery -n '__fish_seen_subcommand_from f files' -s s -l timestamp -d "Include timestamp in output"
+complete -c equery -n '__fish_seen_subcommand_from f files' -s t -l type -d "Include file type in output"
+complete -c equery -n '__fish_seen_subcommand_from f files' -l tree -d "Display results in a tree"
+complete -c equery -n '__fish_seen_subcommand_from f files' -s f -l filter -d "Filter output by file type" \
+    -xa "(__fish_complete_list , __fish_equery_files_filter_args)"
 
 # has + hasuse
 complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s I -l exclude-installed -d "Exclude installed pkgs from search path"
-complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s o -l overlay-tree      -d "Include overlays in search path"
-complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s p -l portage-tree      -d "Include entire portage tree in search path"
+complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s o -l overlay-tree -d "Include overlays in search path"
+complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s p -l portage-tree -d "Include entire portage tree in search path"
 #complete -c equery -n '__fish_seen_subcommand_from a has h hasuse' -s F -l format=TMPL       -d "Specify a custom output format"
 
 # keywords
 # TODO
 
 # list
-complete -c equery -n '__fish_seen_subcommand_from l list' -s d -l duplicates        -d "List only installed duplicate pkgs"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s b -l binpkgs-missing   -d "List only installed pkgs without a corresponding binary pkg"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s f -l full-regex        -d "Query is a regex"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s m -l mask-reason       -d "Include reason for pkg mask"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s d -l duplicates -d "List only installed duplicate pkgs"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s b -l binpkgs-missing -d "List only installed pkgs without a corresponding binary pkg"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s f -l full-regex -d "Query is a regex"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s m -l mask-reason -d "Include reason for pkg mask"
 complete -c equery -n '__fish_seen_subcommand_from l list' -s I -l exclude-installed -d "Exclude installed pkgs from output"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s o -l overlay-tree      -d "List pkgs in overlays"
-complete -c equery -n '__fish_seen_subcommand_from l list' -s p -l portage-tree      -d "List pkgs in the main portage tree"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s o -l overlay-tree -d "List pkgs in overlays"
+complete -c equery -n '__fish_seen_subcommand_from l list' -s p -l portage-tree -d "List pkgs in the main portage tree"
 #complete -c equery -n '__fish_seen_subcommand_from l list' -s F -l format=TMPL       -d "Specify a custom output format"
 complete -c equery -n '__fish_seen_subcommand_from l list; and not __fish_contains_opt -s p portage-tree' \
-	-xa "(__fish_portage_print_installed_pkgs)"
+    -xa "(__fish_portage_print_installed_pkgs)"
 complete -c equery -n '__fish_seen_subcommand_from l list; and     __fish_contains_opt -s p portage-tree' \
-	-xa "(__fish_portage_print_available_pkgs)"
+    -xa "(__fish_portage_print_available_pkgs)"
 
 # meta
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s d -l description       -d "Show extended pkg description"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s H -l herd              -d "Show pkg's herd(s)"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s k -l keywords          -d "Show keywords for all matching pkg versions"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s l -l license           -d "Show licenses for the best maching version"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s m -l maintainer        -d "Show the maintainer(s) for the pkg"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s S -l stablreq          -d "Show STABLEREQ arches (cc's) for all matching pkg versions"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s u -l useflags          -d "Show per-pkg USE flag descriptions"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s U -l upstream          -d "Show pkg's upstream information"
-complete -c equery -n '__fish_seen_subcommand_from m meta' -s x -l xml               -d "Show the plain metadata.xml file"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s d -l description -d "Show extended pkg description"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s H -l herd -d "Show pkg's herd(s)"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s k -l keywords -d "Show keywords for all matching pkg versions"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s l -l license -d "Show licenses for the best maching version"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s m -l maintainer -d "Show the maintainer(s) for the pkg"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s S -l stablreq -d "Show STABLEREQ arches (cc's) for all matching pkg versions"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s u -l useflags -d "Show per-pkg USE flag descriptions"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s U -l upstream -d "Show pkg's upstream information"
+complete -c equery -n '__fish_seen_subcommand_from m meta' -s x -l xml -d "Show the plain metadata.xml file"
 
 # size
-complete -c equery -n '__fish_seen_subcommand_from s size' -s b -l bytes             -d "Report size in bytes"
-complete -c equery -n '__fish_seen_subcommand_from s size' -s f -l full-regex        -d "Query is a regex"
+complete -c equery -n '__fish_seen_subcommand_from s size' -s b -l bytes -d "Report size in bytes"
+complete -c equery -n '__fish_seen_subcommand_from s size' -s f -l full-regex -d "Query is a regex"
 
 # uses
-complete -c equery -n '__fish_seen_subcommand_from u uses' -s a -l all               -d "Include all pkg versions"
-complete -c equery -n '__fish_seen_subcommand_from u uses' -s i -l ignore-l10n       -d "Don't show l10n USE flags"
+complete -c equery -n '__fish_seen_subcommand_from u uses' -s a -l all -d "Include all pkg versions"
+complete -c equery -n '__fish_seen_subcommand_from u uses' -s i -l ignore-l10n -d "Don't show l10n USE flags"
 
 # which
-complete -c equery -n '__fish_seen_subcommand_from w which' -s m -l include-masked   -d "Return highest version ebuild available"
-complete -c equery -n '__fish_seen_subcommand_from w which' -s e -l ebuild           -d "Print the ebuild"
+complete -c equery -n '__fish_seen_subcommand_from w which' -s m -l include-masked -d "Return highest version ebuild available"
+complete -c equery -n '__fish_seen_subcommand_from w which' -s e -l ebuild -d "Print the ebuild"
diff --git a/share/completions/evince.fish b/share/completions/evince.fish
index f63e921f1..cc1e048e6 100644
--- a/share/completions/evince.fish
+++ b/share/completions/evince.fish
@@ -4,5 +4,5 @@ complete -c evince -s p -l page-label -d "The page of the document to display" -
 complete -c evince -s f -l fullscreen -d "Run evince in fullscreen mode"
 complete -c evince -s s -l presentation -d "Run evince in presentation mode"
 complete -c evince -s w -l preview -d "Run evince as a previewer"
-complete -c evince      -l display -d "X display to use"
+complete -c evince -l display -d "X display to use"
 
diff --git a/share/completions/exercism.fish b/share/completions/exercism.fish
index b6b62d3a8..df88e0297 100644
--- a/share/completions/exercism.fish
+++ b/share/completions/exercism.fish
@@ -1,10 +1,10 @@
 function __fish_exercism_no_subcommand -d 'Test if exercism has yet to be given the subcommand'
-        for i in (commandline -opc)
-                if contains -- $i demo debug configure fetch restore submit unsubmit tracks download help
-                        return 1
-                end
+    for i in (commandline -opc)
+        if contains -- $i demo debug configure fetch restore submit unsubmit tracks download help
+            return 1
         end
-        return 0
+    end
+    return 0
 end
 
 complete -c exercism -s c -l config -d 'path to config file [$EXERCISM_CONFIG_FILE, $XDG_CONFIG_HOME]'
diff --git a/share/completions/expand.fish b/share/completions/expand.fish
index 93cd7eae9..28e2ea7c0 100644
--- a/share/completions/expand.fish
+++ b/share/completions/expand.fish
@@ -1,5 +1,5 @@
-complete -c expand -s i -l initial       -d 'do not convert tabs after non blanks'
-complete -c expand -s t -l tabs -x       -d 'have tabs NUMBER characters apart, not 8'
-complete -c expand -s t -l tabs -x       -d 'use comma separated list of explicit tab positions'
-complete -c expand -l help     -d 'display this help and exit'
-complete -c expand -l version  -d 'output version information and exit'
+complete -c expand -s i -l initial -d 'do not convert tabs after non blanks'
+complete -c expand -s t -l tabs -x -d 'have tabs NUMBER characters apart, not 8'
+complete -c expand -s t -l tabs -x -d 'use comma separated list of explicit tab positions'
+complete -c expand -l help -d 'display this help and exit'
+complete -c expand -l version -d 'output version information and exit'
diff --git a/share/completions/feh.fish b/share/completions/feh.fish
index 362f32275..26e32cf65 100644
--- a/share/completions/feh.fish
+++ b/share/completions/feh.fish
@@ -1,7 +1,7 @@
 complete -c feh -l action -s A -x -d "Specify a shell command as action to perform on the image"
 
 for i in (seq 1 9)
-	complete -c feh -l action$i -x -d "Extra action triggered with number key "$i
+    complete -c feh -l action$i -x -d "Extra action triggered with number key "$i
 end
 
 complete -c feh -l auto-zoom -s Z -d "Zoom pictures to screen size"
diff --git a/share/completions/find.fish b/share/completions/find.fish
index e7301ef00..ecc3d15ed 100644
--- a/share/completions/find.fish
+++ b/share/completions/find.fish
@@ -73,7 +73,7 @@ complete -c find -o true -d "Always true"
 
 set -l type_comp 'b\t"Block device" c\t"Character device" d\t"Directory" p\t"Named pipe" f\t"File" l\t"Symbolic link" s\t"Socket"'
 
-complete -c find -o type -d "File is of specified type" -x -a  $type_comp
+complete -c find -o type -d "File is of specified type" -x -a $type_comp
 
 complete -c find -o uid -d "File's owner has specified numeric user ID" -r
 complete -c find -o used -d "File was last accessed specified number of days after its status was last changed" -r
diff --git a/share/completions/flac.fish b/share/completions/flac.fish
index c7818bc7b..a7693b8f3 100644
--- a/share/completions/flac.fish
+++ b/share/completions/flac.fish
@@ -1,66 +1,66 @@
 #
 # Completions for flac
 #
-complete -c flac -s v -l version               -d "Show the flac version number"
-complete -c flac -s h -l help                  -d "Show this screen"
-complete -c flac -s H -l explain               -d "Show detailed explanation of usage and options"
-complete -c flac -s d -l decode                -d "Decode (the default behavior is to encode)"
-complete -c flac -s t -l test                  -d "Same as -d except no decoded file is written"
-complete -c flac -s a -l analyze               -d "Same as -d except an analysis file is written"
-complete -c flac -s c -l stdout                -d "Write output to stdout"
-complete -c flac -s s -l silent                -d "Do not write runtime encode/decode statistics"
-complete -c flac -l totally-silent           -d "Do not print anything including errors"
-complete -c flac -s f -l force                 -d "Force overwriting of output files"
-complete -c flac -r -s o -l output-name          -d "Force the output file name"
-complete -c flac -l output-prefix           -d "Prepend STRING to output names"
-complete -c flac -l delete-input-file        -d "Deletes after a successful encode/decode"
-complete -c flac -l skip                    -d "Skip the given initial samples for each input {#|mm:ss.ss}"
-complete -c flac -l until                   -d "Stop at the given sample for each input file {#|[+|-]mm:ss.ss}"
-complete -c flac -l ogg                      -d "Use Ogg as transport layer"
-complete -c flac -l serial-number            -d "Serial number to use for the FLAC stream"
-complete -c flac -l residual-text            -d "Include residual signal in text output"
-complete -c flac -l residual-gnuplot         -d "Generate gnuplot files of residual distribution"
-complete -c flac -s F -l decode-through-errors  -d "Continue decoding through stream errors"
-complete -c flac -l cue                      -d "Set the beginning and ending cuepoints to decode [#.#][-[#.#]]"
-complete -c flac -s V -l verify                 -d "Verify a correct encoding"
-complete -c flac -l lax                   -d "Allow encoder to generate non-Subset files"
-complete -c flac -l sector-align          -d "Align multiple files on sector boundaries"
-complete -c flac -l replay-gain           -d "Calculate ReplayGain & store in Vorbis comments"
-complete -c flac -l cuesheet     -d "Import cuesheet and store in CUESHEET block"
-complete -c flac -x -s T -l tag        -d "Add a Vorbis comment FIELD=VALUE; may appear multiple times"
-complete -c flac -x -s T -l tag-from-file   -d "Read tags from file"
-complete -c flac -x -s S -l seekpoint             -d "Add seek point(s) {#|X|#x|#s}"
-complete -c flac -x -s P -l padding               -d "Write a PADDING block of length #"
-complete -c flac -s 0 -l compression-level-0    -d "Synonymous with -l 0 -b 1152 -r 22"
-complete -c flac      -l fast                        -d "Synonymous with -l 0 -b 1152 -r 22"
-complete -c flac -s 1 -l compression-level-1         -d "Synonymous with -l 0 -b 1152 -M -r 2,2"
-complete -c flac -s 2 -l compression-level-2         -d "Synonymous with -l 0 -b 1152 -m -r 3"
-complete -c flac -s 3 -l compression-level-3         -d "Synonymous with -l 6 -b 4608 -r 3,3"
-complete -c flac -s 4 -l compression-level-4         -d "Synonymous with -l 8 -b 4608 -M -r 3,3"
-complete -c flac -s 5 -l compression-level-5         -d "Synonymous with -l 8 -b 4608 -m -r 3,3"
-complete -c flac -s 6 -l compression-level-6         -d "Synonymous with -l 8 -b 4608 -m -r 4"
-complete -c flac -s 7 -l compression-level-7         -d "Synonymous with -l 8 -b 4608 -m -e -r 6"
-complete -c flac -s 8 -l compression-level-8   -d "Synonymous with -l 12 -b 4608 -m -e -r 6"
-complete -c flac      -l best                  -d "Synonymous with -l 12 -b 4608 -m -e -r 6"
-complete -c flac -x -s b -l blocksize                 -d "Specify blocksize in samples"
-complete -c flac -s m -l mid-side                    -d "Try mid-side coding for each frame"
-complete -c flac -s M -l adaptive-mid-side           -d "Adaptive mid-side coding for all frames"
-complete -c flac -s e -l exhaustive-model-search     -d "Do exhaustive model search (expensive!)"
-complete -c flac -x -s l -l max-lpc-order              -d "Max LPC order; 0 => only fixed predictors"
-complete -c flac -s p -l qlp-coeff-precision-search  -d "Exhaustively search LP coeff quantization"
-complete -c flac -x -s q -l qlp-coeff-precision       -d "Specify precision in bits"
-complete -c flac -x -s r -l rice-partition-order   -d "Set [min,]max residual partition order"
+complete -c flac -s v -l version -d "Show the flac version number"
+complete -c flac -s h -l help -d "Show this screen"
+complete -c flac -s H -l explain -d "Show detailed explanation of usage and options"
+complete -c flac -s d -l decode -d "Decode (the default behavior is to encode)"
+complete -c flac -s t -l test -d "Same as -d except no decoded file is written"
+complete -c flac -s a -l analyze -d "Same as -d except an analysis file is written"
+complete -c flac -s c -l stdout -d "Write output to stdout"
+complete -c flac -s s -l silent -d "Do not write runtime encode/decode statistics"
+complete -c flac -l totally-silent -d "Do not print anything including errors"
+complete -c flac -s f -l force -d "Force overwriting of output files"
+complete -c flac -r -s o -l output-name -d "Force the output file name"
+complete -c flac -l output-prefix -d "Prepend STRING to output names"
+complete -c flac -l delete-input-file -d "Deletes after a successful encode/decode"
+complete -c flac -l skip -d "Skip the given initial samples for each input {#|mm:ss.ss}"
+complete -c flac -l until -d "Stop at the given sample for each input file {#|[+|-]mm:ss.ss}"
+complete -c flac -l ogg -d "Use Ogg as transport layer"
+complete -c flac -l serial-number -d "Serial number to use for the FLAC stream"
+complete -c flac -l residual-text -d "Include residual signal in text output"
+complete -c flac -l residual-gnuplot -d "Generate gnuplot files of residual distribution"
+complete -c flac -s F -l decode-through-errors -d "Continue decoding through stream errors"
+complete -c flac -l cue -d "Set the beginning and ending cuepoints to decode [#.#][-[#.#]]"
+complete -c flac -s V -l verify -d "Verify a correct encoding"
+complete -c flac -l lax -d "Allow encoder to generate non-Subset files"
+complete -c flac -l sector-align -d "Align multiple files on sector boundaries"
+complete -c flac -l replay-gain -d "Calculate ReplayGain & store in Vorbis comments"
+complete -c flac -l cuesheet -d "Import cuesheet and store in CUESHEET block"
+complete -c flac -x -s T -l tag -d "Add a Vorbis comment FIELD=VALUE; may appear multiple times"
+complete -c flac -x -s T -l tag-from-file -d "Read tags from file"
+complete -c flac -x -s S -l seekpoint -d "Add seek point(s) {#|X|#x|#s}"
+complete -c flac -x -s P -l padding -d "Write a PADDING block of length #"
+complete -c flac -s 0 -l compression-level-0 -d "Synonymous with -l 0 -b 1152 -r 22"
+complete -c flac -l fast -d "Synonymous with -l 0 -b 1152 -r 22"
+complete -c flac -s 1 -l compression-level-1 -d "Synonymous with -l 0 -b 1152 -M -r 2,2"
+complete -c flac -s 2 -l compression-level-2 -d "Synonymous with -l 0 -b 1152 -m -r 3"
+complete -c flac -s 3 -l compression-level-3 -d "Synonymous with -l 6 -b 4608 -r 3,3"
+complete -c flac -s 4 -l compression-level-4 -d "Synonymous with -l 8 -b 4608 -M -r 3,3"
+complete -c flac -s 5 -l compression-level-5 -d "Synonymous with -l 8 -b 4608 -m -r 3,3"
+complete -c flac -s 6 -l compression-level-6 -d "Synonymous with -l 8 -b 4608 -m -r 4"
+complete -c flac -s 7 -l compression-level-7 -d "Synonymous with -l 8 -b 4608 -m -e -r 6"
+complete -c flac -s 8 -l compression-level-8 -d "Synonymous with -l 12 -b 4608 -m -e -r 6"
+complete -c flac -l best -d "Synonymous with -l 12 -b 4608 -m -e -r 6"
+complete -c flac -x -s b -l blocksize -d "Specify blocksize in samples"
+complete -c flac -s m -l mid-side -d "Try mid-side coding for each frame"
+complete -c flac -s M -l adaptive-mid-side -d "Adaptive mid-side coding for all frames"
+complete -c flac -s e -l exhaustive-model-search -d "Do exhaustive model search (expensive!)"
+complete -c flac -x -s l -l max-lpc-order -d "Max LPC order; 0 => only fixed predictors"
+complete -c flac -s p -l qlp-coeff-precision-search -d "Exhaustively search LP coeff quantization"
+complete -c flac -x -s q -l qlp-coeff-precision -d "Specify precision in bits"
+complete -c flac -x -s r -l rice-partition-order -d "Set [min,]max residual partition order"
 
 complete -c flac -l endian=big -d "Set byte order for samples"
 complete -c flac -l endian=little -d "Set byte order for samples"
-complete -c flac -l channels            -d "Number of channels"
-complete -c flac -l bps                 -d "Number of bits per sample"
-complete -c flac -l sample-rate         -d "Sample rate in Hz"
+complete -c flac -l channels -d "Number of channels"
+complete -c flac -l bps -d "Number of bits per sample"
+complete -c flac -l sample-rate -d "Sample rate in Hz"
 complete -c flac -l sign=unsigned -d "Sign of samples"
 complete -c flac -l sign=signed -d "Sign of samples"
-complete -c flac -l input-size          -d "Size of the raw input in bytes"
-complete -c flac -l force-aiff-format     -d "Force decoding to AIFF format"
-complete -c flac -l force-raw-format      -d "Treat input or output as raw samples"
+complete -c flac -l input-size -d "Size of the raw input in bytes"
+complete -c flac -l force-aiff-format -d "Force decoding to AIFF format"
+complete -c flac -l force-raw-format -d "Treat input or output as raw samples"
 
 complete -c flac -l no-adaptive-mid-side -d "No adaptive mid-side coding for all frames"
 complete -c flac -l no-decode-through-errors -d "Don't continue decoding through stream errors"
diff --git a/share/completions/flatpak.fish b/share/completions/flatpak.fish
index 9f25836b7..5964fee54 100644
--- a/share/completions/flatpak.fish
+++ b/share/completions/flatpak.fish
@@ -1,34 +1,34 @@
 # Completions for flatpak, an "Application deployment framework for desktop apps"
 # (http://flatpak.org)
 set -l commands install update uninstall list info run override make-current enter document-{export,unexport,info,list} \
-remote-{add,modify,delete,list,ls} build build-{init,finish,export,bundle,import-bundle,sign,update-repo}
+    remote-{add,modify,delete,list,ls} build build-{init,finish,export,bundle,import-bundle,sign,update-repo}
 
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a install             -d 'Install an application or runtime from a remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a update              -d 'Update an installed application or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a uninstall           -d 'Uninstall an installed application or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a list                -d 'List installed apps and/or runtimes'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a info                -d 'Show info for installed app or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a run                 -d 'Run an application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a override            -d 'Override permissions for an application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a make-current        -d 'Specify default version to run'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a enter               -d 'Enter the namespace of a running application'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-export     -d 'Grant an application access to a specific file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-unexport   -d 'Revoke access to a specific file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-info       -d 'Show information about a specific file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-list       -d 'List exported files'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-add          -d 'Add a new remote repository (by URL)'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-modify       -d 'Modify properties of a configured remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-delete       -d 'Delete a configured remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-list         -d 'List all configured remotes'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-ls           -d 'List contents of a configured remote'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-init          -d 'Initialize a directory for building'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build               -d 'Run a build command inside the build dir'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-finish        -d 'Finish a build dir for export'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-export        -d 'Export a build dir to a repository'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-bundle        -d 'Create a bundle file from a build directory'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a install -d 'Install an application or runtime from a remote'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a update -d 'Update an installed application or runtime'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a uninstall -d 'Uninstall an installed application or runtime'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a list -d 'List installed apps and/or runtimes'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a info -d 'Show info for installed app or runtime'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a run -d 'Run an application'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a override -d 'Override permissions for an application'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a make-current -d 'Specify default version to run'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a enter -d 'Enter the namespace of a running application'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-export -d 'Grant an application access to a specific file'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-unexport -d 'Revoke access to a specific file'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-info -d 'Show information about a specific file'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a document-list -d 'List exported files'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-add -d 'Add a new remote repository (by URL)'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-modify -d 'Modify properties of a configured remote'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-delete -d 'Delete a configured remote'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-list -d 'List all configured remotes'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a remote-ls -d 'List contents of a configured remote'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-init -d 'Initialize a directory for building'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build -d 'Run a build command inside the build dir'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-finish -d 'Finish a build dir for export'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-export -d 'Export a build dir to a repository'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-bundle -d 'Create a bundle file from a build directory'
 complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-import-bundle -d 'Import a bundle file'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-sign          -d 'Sign an application or runtime'
-complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-update-repo   -d 'Update the summary file in a repository'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-sign -d 'Sign an application or runtime'
+complete -f -c flatpak -n "not __fish_seen_subcommand_from $commands" -a build-update-repo -d 'Update the summary file in a repository'
 
 complete -f -c flatpak -n "__fish_seen_subcommand_from run" -a "(flatpak list --app | string match -r '\S+')"
 complete -f -c flatpak -n "__fish_seen_subcommand_from info uninstall" -a "(flatpak list | string match -r '\S+')"
diff --git a/share/completions/functions.fish b/share/completions/functions.fish
index 6010f583a..51a265b4e 100644
--- a/share/completions/functions.fish
+++ b/share/completions/functions.fish
@@ -1,10 +1,10 @@
 function __fish_maybe_list_all_functions
-	# if the current commandline token starts with an _, list all functions
-	if string match -qr -- '^_' (commandline -ct)
-		functions -an
-	else
-		functions -n
-	end
+    # if the current commandline token starts with an _, list all functions
+    if string match -qr -- '^_' (commandline -ct)
+        functions -an
+    else
+        functions -n
+    end
 end
 
 complete -c functions -s e -l erase -d "Erase function" -x -a "(__fish_maybe_list_all_functions)"
diff --git a/share/completions/fuser.fish b/share/completions/fuser.fish
index 2cbab2bdb..83463834a 100644
--- a/share/completions/fuser.fish
+++ b/share/completions/fuser.fish
@@ -1,9 +1,9 @@
 __fish_make_completion_signals
 for i in $__kill_signals
-	set number (echo $i | cut -d " " -f 1)
-	set name (echo $i | cut -d " " -f 2)
-	complete -c fuser -o $number -d $name
-	complete -c fuser -o $name -d $name
+    set number (echo $i | cut -d " " -f 1)
+    set name (echo $i | cut -d " " -f 2)
+    complete -c fuser -o $number -d $name
+    complete -c fuser -o $name -d $name
 end
 
 complete -c fuser -s a -l all -d 'Show all files specified on the command line'
diff --git a/share/completions/gcc.fish b/share/completions/gcc.fish
index e46947b61..034e7e36f 100644
--- a/share/completions/gcc.fish
+++ b/share/completions/gcc.fish
@@ -21,9 +21,9 @@ complete -c gcc -o std -d "Standard mode" -x -a '
 	gnu++98\t"ISO C++98 plus GNU extentions"
 '
 
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;
-	complete -c gcc -o ftemplate-depth-$i -d "Set maximum template depth"
-end;
+for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
+    complete -c gcc -o ftemplate-depth-$i -d "Set maximum template depth"
+end
 
 complete -c gcc -s o -d 'Place output in file' -r
 complete -c gcc -o aux-info -d 'Output to the given filename prototyped declarations for all functions declared and/or defined in a translation unit, including those in header files' -r
diff --git a/share/completions/git.fish b/share/completions/git.fish
index d536eaa97..41c30f10b 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -156,7 +156,7 @@ function __fish_git_files
     # Version >= 2.11.* has the v2 format.
     if test "$ver[1]" -gt 2 2>/dev/null; or test "$ver[1]" -eq 2 -a "$ver[2]" -ge 11 2>/dev/null
         command git $git_opt status --porcelain=2 $status_opt \
-        | while read -la -d ' ' line
+            | while read -la -d ' ' line
             set -l file
             set -l desc
             # The basic status format is "XY", where X is "our" state (meaning the staging area),
@@ -284,7 +284,7 @@ function __fish_git_files
         # Note that we can't use space as a delimiter between status and filename, because
         # the status can contain spaces - " M" is different from "M ".
         command git $git_opt status --porcelain -z $status_opt \
-        | while read -lz line
+            | while read -lz line
             set -l desc
             # The entire line is the "from" from a rename.
             if set -q use_next[1]
@@ -458,9 +458,9 @@ function __fish_git_needs_command
     # Git has tons of options, but fortunately only a few can appear before the command.
     # They are listed here.
     set -l opts h-help p P-paginate N-no-pager b-bare o-no-replace-objects \
-    l-literal-pathspecs g-glob-pathspecs O-noglob-pathspecs i-icase-pathspecs \
-    e-exec-path= G-git-dir= c= C= v-version H-html-path \
-    m-man-path I-info-path w-work-tree= a-namespace= s-super-prefix=
+        l-literal-pathspecs g-glob-pathspecs O-noglob-pathspecs i-icase-pathspecs \
+        e-exec-path= G-git-dir= c= C= v-version H-html-path \
+        m-man-path I-info-path w-work-tree= a-namespace= s-super-prefix=
     set cmd (commandline -opc)
     set -e cmd[1]
     argparse -s $opts -- $cmd 2>/dev/null
diff --git a/share/completions/gpasswd.fish b/share/completions/gpasswd.fish
index bd5a51621..f51489d4d 100644
--- a/share/completions/gpasswd.fish
+++ b/share/completions/gpasswd.fish
@@ -5,6 +5,6 @@ complete -c gpasswd -s d -l delete -d 'Remove user from group' -xa '(__fish_comp
 complete -c gpasswd -s h -l help -d 'Print help'
 complete -c gpasswd -s r -l remove-password -d 'Remove the GROUP\'s password'
 complete -c gpasswd -s R -l restrict -d 'Restrict access to GROUP to its members'
-complete -c gpasswd -s M -l members  -d 'Set the list of members of GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
+complete -c gpasswd -s M -l members -d 'Set the list of members of GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
 complete -c gpasswd -s A -l administrators -d 'set the list of administrators for GROUP' -xa '(__fish_complete_list , __fish_complete_users)'
 
diff --git a/share/completions/gpg.fish b/share/completions/gpg.fish
index af1f0f9de..e2dd8a50d 100644
--- a/share/completions/gpg.fish
+++ b/share/completions/gpg.fish
@@ -20,46 +20,46 @@
 #
 
 function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
-	# gpg doesn't seem to like it when you use the whole key name as a
-	# completion, so we skip the <EMAIL> part and use it a s a
-	# description.
-	# It also replaces colons with \x3a
-	gpg --list-keys --with-colon|cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
+    # gpg doesn't seem to like it when you use the whole key name as a
+    # completion, so we skip the <EMAIL> part and use it a s a
+    # description.
+    # It also replaces colons with \x3a
+    gpg --list-keys --with-colon | cut -d : -f 10 | sed -ne 's/\\\x3a/:/g' -e 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
 end
 
 function __fish_complete_gpg_key_id -d 'Complete using gpg key ids'
-	# Use user_id as the description
-	set -l lastid
-	gpg --list-keys --with-colons | while read garbage
-		switch $garbage
-			case "uid*"
-				echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read lastid
-			case "*"
-				echo $garbage | cut -d ":" -f 5 | read fingerprint
-		end
-		printf "%s\t%s\n" $fingerprint $lastid
-	end
+    # Use user_id as the description
+    set -l lastid
+    gpg --list-keys --with-colons | while read garbage
+        switch $garbage
+            case "uid*"
+                echo $garbage | cut -d ":" -f 10 | sed -e "s/\\\x3a/:/g" | read lastid
+            case "*"
+                echo $garbage | cut -d ":" -f 5 | read fingerprint
+        end
+        printf "%s\t%s\n" $fingerprint $lastid
+    end
 end
 
 function __fish_print_gpg_algo -d "Complete using all algorithms of the type specified in argv[1] supported by gpg. argv[1] is a regexp"
-	# Set a known locale, so that the output format of 'gpg --version'
-	# is at least somewhat predictable. The locale will automatically
-	# expire when the function goes out of scope, and the original locale
-	# will take effect again.
-	set -lx LC_ALL C
+    # Set a known locale, so that the output format of 'gpg --version'
+    # is at least somewhat predictable. The locale will automatically
+    # expire when the function goes out of scope, and the original locale
+    # will take effect again.
+    set -lx LC_ALL C
 
-	# sed script explained:
-	# in the line that matches "$argv:"
-	# 	define label 'loop'
-	# 	if the line ends with a ','
-	# 		add next line to buffer
-	#		transliterate '\n' with ' '
-	#		goto loop
-	# 	remove everything until the first ':' of the line
-	# 	remove all blanks
-	# 	transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
-	# 	print result
-	gpg --version | sed -ne "/$argv:/"'{:loop; /,$/{N; y!\n! !; b loop}; s!^[^:]*:!!; s![ ]*!!g; y!,!\n!; p}'
+    # sed script explained:
+    # in the line that matches "$argv:"
+    # 	define label 'loop'
+    # 	if the line ends with a ','
+    # 		add next line to buffer
+    #		transliterate '\n' with ' '
+    #		goto loop
+    # 	remove everything until the first ':' of the line
+    # 	remove all blanks
+    # 	transliterate ',' with '\n' (OSX apparently doesn't like '\n' on RHS of the s-command)
+    # 	print result
+    gpg --version | sed -ne "/$argv:/"'{:loop; /,$/{N; y!\n! !; b loop}; s!^[^:]*:!!; s![ ]*!!g; y!,!\n!; p}'
 end
 
 
diff --git a/share/completions/gphoto2.fish b/share/completions/gphoto2.fish
index add427764..71c805c69 100644
--- a/share/completions/gphoto2.fish
+++ b/share/completions/gphoto2.fish
@@ -1,81 +1,81 @@
 
 #Common options
-complete -c gphoto2   -s '?' -l 'help'                             -d 'Print complete help message on program usage'
-complete -c gphoto2          -l 'usage'                            -d 'Print short message on program usage'
-complete -c gphoto2          -l 'debug'                            -d 'Turn on debugging'
-complete -c gphoto2          -l 'debug-logfile' -r                 -d 'Name of file to write debug info to'
-complete -c gphoto2          -l 'quiet'                            -d 'Quiet output (default=verbose)'
-complete -c gphoto2          -l 'hook-script' -r                   -d 'Hook script to call after downloads, captures, etc.'
+complete -c gphoto2 -s '?' -l 'help' -d 'Print complete help message on program usage'
+complete -c gphoto2 -l 'usage' -d 'Print short message on program usage'
+complete -c gphoto2 -l 'debug' -d 'Turn on debugging'
+complete -c gphoto2 -l 'debug-logfile' -r -d 'Name of file to write debug info to'
+complete -c gphoto2 -l 'quiet' -d 'Quiet output (default=verbose)'
+complete -c gphoto2 -l 'hook-script' -r -d 'Hook script to call after downloads, captures, etc.'
 
 #Miscellaneous options (unsorted)
-complete -c gphoto2          -l 'stdout'                           -d 'Send file to stdout'
-complete -c gphoto2          -l 'stdout-size'                      -d 'Print filesize before data'
-complete -c gphoto2          -l 'auto-detect'                      -d 'List auto-detected cameras'
-complete -c gphoto2          -l 'show-exif' -r                     -d 'Show EXIF information'
-complete -c gphoto2          -l 'show-info' -r                     -d 'Show info'
-complete -c gphoto2          -l 'summary'                          -d 'Show summary'
-complete -c gphoto2          -l 'manual'                           -d 'Show camera driver manual'
-complete -c gphoto2          -l 'about'                            -d 'About the camera driver manual'
-complete -c gphoto2          -l 'storage-info'                     -d 'Show storage information'
-complete -c gphoto2          -l 'shell'                            -d 'gPhoto shell'
+complete -c gphoto2 -l 'stdout' -d 'Send file to stdout'
+complete -c gphoto2 -l 'stdout-size' -d 'Print filesize before data'
+complete -c gphoto2 -l 'auto-detect' -d 'List auto-detected cameras'
+complete -c gphoto2 -l 'show-exif' -r -d 'Show EXIF information'
+complete -c gphoto2 -l 'show-info' -r -d 'Show info'
+complete -c gphoto2 -l 'summary' -d 'Show summary'
+complete -c gphoto2 -l 'manual' -d 'Show camera driver manual'
+complete -c gphoto2 -l 'about' -d 'About the camera driver manual'
+complete -c gphoto2 -l 'storage-info' -d 'Show storage information'
+complete -c gphoto2 -l 'shell' -d 'gPhoto shell'
 
 #Get information on software and host system (not from the camera)
-complete -c gphoto2    -s v  -l 'version'                          -d 'Display version and exit'
-complete -c gphoto2          -l 'list-cameras'                     -d 'List supported camera models'
-complete -c gphoto2          -l 'list-ports'                       -d 'List supported port devices'
-complete -c gphoto2    -s a  -l 'abilities'                        -d 'Display camera/driver abilities'
+complete -c gphoto2 -s v -l 'version' -d 'Display version and exit'
+complete -c gphoto2 -l 'list-cameras' -d 'List supported camera models'
+complete -c gphoto2 -l 'list-ports' -d 'List supported port devices'
+complete -c gphoto2 -s a -l 'abilities' -d 'Display camera/driver abilities'
 
 #Specify the camera to use
-complete -c gphoto2          -l 'port' -r                          -d 'Specify device port'
-complete -c gphoto2          -l 'speed' -r                         -d 'Specify serial transfer speed'
-complete -c gphoto2          -l 'camera' -r                        -d 'Specify camera model'
-complete -c gphoto2          -l 'usbid' -r                         -d '(expert only) Override USB IDs'
+complete -c gphoto2 -l 'port' -r -d 'Specify device port'
+complete -c gphoto2 -l 'speed' -r -d 'Specify serial transfer speed'
+complete -c gphoto2 -l 'camera' -r -d 'Specify camera model'
+complete -c gphoto2 -l 'usbid' -r -d '(expert only) Override USB IDs'
 
 #Camera and software configuration
-complete -c gphoto2          -l 'list-config'                      -d 'List configuration tree'
-complete -c gphoto2          -l 'list-all-config'                  -d 'Dump full configuration tree'
-complete -c gphoto2          -l 'get-config' -r                    -d 'Get configuration value'
-complete -c gphoto2          -l 'set-config' -r                    -d 'Set configuration value or index in choices'
-complete -c gphoto2          -l 'set-config-index' -r              -d 'Set configuration value index in choices'
-complete -c gphoto2          -l 'set-config-value' -r              -d 'Set configuration value'
+complete -c gphoto2 -l 'list-config' -d 'List configuration tree'
+complete -c gphoto2 -l 'list-all-config' -d 'Dump full configuration tree'
+complete -c gphoto2 -l 'get-config' -r -d 'Get configuration value'
+complete -c gphoto2 -l 'set-config' -r -d 'Set configuration value or index in choices'
+complete -c gphoto2 -l 'set-config-index' -r -d 'Set configuration value index in choices'
+complete -c gphoto2 -l 'set-config-value' -r -d 'Set configuration value'
 
 #Capture an image from or on the camera
-complete -c gphoto2          -l 'wait-event'                       -d 'Wait for event(s) from camera'
-complete -c gphoto2          -l 'wait-event-and-download'          -d 'Wait for event(s) from the camera and download new images'
-complete -c gphoto2          -l 'capture-preview'                  -d 'Capture a quick preview'
-complete -c gphoto2    -s B  -l 'bulb' -r                          -d 'Set bulb exposure time in seconds'
-complete -c gphoto2    -s F  -l 'frames' -r                        -d 'Set number of frames to capture (default=infinite)'
-complete -c gphoto2    -s I  -l 'interval' -r                      -d 'Set capture interval in seconds'
-complete -c gphoto2          -l 'reset-interval'                   -d 'Reset capture interval on signal (default=no)'
-complete -c gphoto2          -l 'capture-image'                    -d 'Capture an image'
-complete -c gphoto2          -l 'capture-image-and-download'       -d 'Capture an image and download it'
-complete -c gphoto2          -l 'capture-movie'                    -d 'Capture a movie'
-complete -c gphoto2          -l 'capture-sound'                    -d 'Capture an audio clip'
-complete -c gphoto2          -l 'capture-tethered'                 -d 'Wait for shutter release on the camera and download'
+complete -c gphoto2 -l 'wait-event' -d 'Wait for event(s) from camera'
+complete -c gphoto2 -l 'wait-event-and-download' -d 'Wait for event(s) from the camera and download new images'
+complete -c gphoto2 -l 'capture-preview' -d 'Capture a quick preview'
+complete -c gphoto2 -s B -l 'bulb' -r -d 'Set bulb exposure time in seconds'
+complete -c gphoto2 -s F -l 'frames' -r -d 'Set number of frames to capture (default=infinite)'
+complete -c gphoto2 -s I -l 'interval' -r -d 'Set capture interval in seconds'
+complete -c gphoto2 -l 'reset-interval' -d 'Reset capture interval on signal (default=no)'
+complete -c gphoto2 -l 'capture-image' -d 'Capture an image'
+complete -c gphoto2 -l 'capture-image-and-download' -d 'Capture an image and download it'
+complete -c gphoto2 -l 'capture-movie' -d 'Capture a movie'
+complete -c gphoto2 -l 'capture-sound' -d 'Capture an audio clip'
+complete -c gphoto2 -l 'capture-tethered' -d 'Wait for shutter release on the camera and download'
 
 #Downloading, uploading and manipulating files
-complete -c gphoto2    -s l  -l 'list-folders'                     -d 'List folders in folder'
-complete -c gphoto2    -s L  -l 'list-files'                       -d 'List files in folder'
-complete -c gphoto2    -s m  -l 'mkdir' -r                         -d 'Create a directory'
-complete -c gphoto2    -s r  -l 'rmdir' -r                         -d 'Remove a directory'
-complete -c gphoto2    -s n  -l 'num-files'                        -d 'Display number of files'
-complete -c gphoto2    -s p  -l 'get-file' -r                      -d 'Get files given in range'
-complete -c gphoto2    -s P  -l 'get-all-files'                    -d 'Get all files from folder'
-complete -c gphoto2    -s t  -l 'get-thumbnail' -r                 -d 'Get thumbnails given in range'
-complete -c gphoto2    -s T  -l 'get-all-thumbnails'               -d 'Get all thumbnails from folder'
-complete -c gphoto2          -l 'get-metadata' -r                  -d 'Get metadata given in range'
-complete -c gphoto2          -l 'get-all-metadata'                 -d 'Get all metadata from folder'
-complete -c gphoto2          -l 'upload-metadata' -r               -d 'Upload metadata for file'
-complete -c gphoto2          -l 'get-raw-data' -r                  -d 'Get raw data given in range'
-complete -c gphoto2          -l 'get-all-raw-data'                 -d 'Get all raw data from folder'
-complete -c gphoto2          -l 'get-audio-data' -r                -d 'Get audio data given in range'
-complete -c gphoto2          -l 'get-all-audio-data'               -d 'Get all audio data from folder'
-complete -c gphoto2    -s d  -l 'delete-file' -r                   -d 'Delete files given in range'
-complete -c gphoto2    -s D  -l 'delete-all-files'                 -d 'Delete all files in folder (--no-recurse by default)'
-complete -c gphoto2    -s u  -l 'upload-file' -r                   -d 'Upload a file to camera'
-complete -c gphoto2          -l 'filename' -r                      -d 'Specify a filename or filename pattern'
-complete -c gphoto2    -s f  -l 'folder' -r                        -d 'Specify camera folder (default="/")'
-complete -c gphoto2    -s R  -l 'recurse'                          -d 'Recursion (default for download)'
-complete -c gphoto2          -l 'no-recurse'                       -d 'No recursion (default for deletion)'
-complete -c gphoto2          -l 'new'                              -d 'Process new files only'
-complete -c gphoto2          -l 'force-overwrite'                  -d 'Overwrite files without asking'
+complete -c gphoto2 -s l -l 'list-folders' -d 'List folders in folder'
+complete -c gphoto2 -s L -l 'list-files' -d 'List files in folder'
+complete -c gphoto2 -s m -l 'mkdir' -r -d 'Create a directory'
+complete -c gphoto2 -s r -l 'rmdir' -r -d 'Remove a directory'
+complete -c gphoto2 -s n -l 'num-files' -d 'Display number of files'
+complete -c gphoto2 -s p -l 'get-file' -r -d 'Get files given in range'
+complete -c gphoto2 -s P -l 'get-all-files' -d 'Get all files from folder'
+complete -c gphoto2 -s t -l 'get-thumbnail' -r -d 'Get thumbnails given in range'
+complete -c gphoto2 -s T -l 'get-all-thumbnails' -d 'Get all thumbnails from folder'
+complete -c gphoto2 -l 'get-metadata' -r -d 'Get metadata given in range'
+complete -c gphoto2 -l 'get-all-metadata' -d 'Get all metadata from folder'
+complete -c gphoto2 -l 'upload-metadata' -r -d 'Upload metadata for file'
+complete -c gphoto2 -l 'get-raw-data' -r -d 'Get raw data given in range'
+complete -c gphoto2 -l 'get-all-raw-data' -d 'Get all raw data from folder'
+complete -c gphoto2 -l 'get-audio-data' -r -d 'Get audio data given in range'
+complete -c gphoto2 -l 'get-all-audio-data' -d 'Get all audio data from folder'
+complete -c gphoto2 -s d -l 'delete-file' -r -d 'Delete files given in range'
+complete -c gphoto2 -s D -l 'delete-all-files' -d 'Delete all files in folder (--no-recurse by default)'
+complete -c gphoto2 -s u -l 'upload-file' -r -d 'Upload a file to camera'
+complete -c gphoto2 -l 'filename' -r -d 'Specify a filename or filename pattern'
+complete -c gphoto2 -s f -l 'folder' -r -d 'Specify camera folder (default="/")'
+complete -c gphoto2 -s R -l 'recurse' -d 'Recursion (default for download)'
+complete -c gphoto2 -l 'no-recurse' -d 'No recursion (default for deletion)'
+complete -c gphoto2 -l 'new' -d 'Process new files only'
+complete -c gphoto2 -l 'force-overwrite' -d 'Overwrite files without asking'
diff --git a/share/completions/gradle.fish b/share/completions/gradle.fish
index bf5343d1b..05e70fb84 100644
--- a/share/completions/gradle.fish
+++ b/share/completions/gradle.fish
@@ -39,22 +39,22 @@ complete -c gradle -l exclude-task -s x -x -d 'Specify task to be excluded from
 
 # https://github.com/hanny24/gradle-fish/blob/master/gradle.load
 function __cache_or_get_gradle_completion
-  # Set up cache directory
-  if test -z $XDG_CACHE_HOME
-    set XDG_CACHE_HOME $HOME/.cache/
-  end
-  mkdir -m 700 -p $XDG_CACHE_HOME/gradle-completions
+    # Set up cache directory
+    if test -z $XDG_CACHE_HOME
+        set XDG_CACHE_HOME $HOME/.cache/
+    end
+    mkdir -m 700 -p $XDG_CACHE_HOME/gradle-completions
 
-  set -l hashed_pwd (fish_md5 -s $PWD)
-  set -l gradle_cache_file $XDG_CACHE_HOME/gradle-completions/$hashed_pwd
-  if not test -f $gradle_cache_file; or command test build.gradle -nt $gradle_cache_file
-    command gradle -q tasks 2>/dev/null | string match -r '^[[:alnum:]]+ - .*' | string replace ' - ' \t > $gradle_cache_file
-  end
-  cat $gradle_cache_file
+    set -l hashed_pwd (fish_md5 -s $PWD)
+    set -l gradle_cache_file $XDG_CACHE_HOME/gradle-completions/$hashed_pwd
+    if not test -f $gradle_cache_file; or command test build.gradle -nt $gradle_cache_file
+        command gradle -q tasks 2>/dev/null | string match -r '^[[:alnum:]]+ - .*' | string replace ' - ' \t >$gradle_cache_file
+    end
+    cat $gradle_cache_file
 end
 
 function __contains_gradle_build
-  test -f build.gradle
+    test -f build.gradle
 end
 
 complete -x -c gradle -n '__contains_gradle_build' -a "(__cache_or_get_gradle_completion)"
diff --git a/share/completions/grunt.fish b/share/completions/grunt.fish
index 828e8841c..1e8b2882c 100644
--- a/share/completions/grunt.fish
+++ b/share/completions/grunt.fish
@@ -8,24 +8,24 @@
 # https://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
 
 function __grunt_print_tasks
-	set -l tasks (grunt --version --verbose 2>/dev/null | awk '/Available tasks: / {$1=$2=""; print $0}' | awk '{$1=$1}1' | tr ' ' '\n')
-	for t in $tasks
-		echo $t
-	end
+    set -l tasks (grunt --version --verbose 2>/dev/null | awk '/Available tasks: / {$1=$2=""; print $0}' | awk '{$1=$1}1' | tr ' ' '\n')
+    for t in $tasks
+        echo $t
+    end
 end
 
 complete -c grunt -fa '(__grunt_print_tasks)'
-complete -c grunt -s h -l help		-d "Display help text"
-complete -c grunt -l base					-d "Specify an alternate base path"
-complete -c grunt -l no-color			-d "Disable colored output"
-complete -c grunt -l gruntfile	 -rd "Specify an alternate Gruntfile"
-complete -c grunt -s d -l debug		-d "Enable debugging mode for tasks that support it"
-complete -c grunt -l stack				-d "Print a stack trace when exiting with a warning or fatal error"
-complete -c grunt -s f -l force		-d "A way to force your way past warnings."
-complete -c grunt -l tasks			 -rd "Additional directory paths to scan for task and "extra" files"
-complete -c grunt -l npm	-x			-d "Npm-installed grunt plugins to scan for task and "extra" files"
-complete -c grunt -l no-write			-d "Disable writing files (dry run)"
-complete -c grunt -s v -l verbose	-d "Verbose mode. A lot more information output"
+complete -c grunt -s h -l help -d "Display help text"
+complete -c grunt -l base -d "Specify an alternate base path"
+complete -c grunt -l no-color -d "Disable colored output"
+complete -c grunt -l gruntfile -rd "Specify an alternate Gruntfile"
+complete -c grunt -s d -l debug -d "Enable debugging mode for tasks that support it"
+complete -c grunt -l stack -d "Print a stack trace when exiting with a warning or fatal error"
+complete -c grunt -s f -l force -d "A way to force your way past warnings."
+complete -c grunt -l tasks -rd "Additional directory paths to scan for task and "extra" files"
+complete -c grunt -l npm -x -d "Npm-installed grunt plugins to scan for task and "extra" files"
+complete -c grunt -l no-write -d "Disable writing files (dry run)"
+complete -c grunt -s v -l verbose -d "Verbose mode. A lot more information output"
 complete -c grunt -s V -l version -d "Print the grunt version. Combine with --verbose for more info"
-complete -c grunt -l completion		-d "Output shell auto-completion rules."
+complete -c grunt -l completion -d "Output shell auto-completion rules."
 
diff --git a/share/completions/gsettings.fish b/share/completions/gsettings.fish
index 67d7575ef..0c10aec0f 100644
--- a/share/completions/gsettings.fish
+++ b/share/completions/gsettings.fish
@@ -9,7 +9,7 @@ function __fish_complete_gsettings_args
     set -e cmd[1]
 
     if set -q cmd[2]
-    and string match -q -- '--schemadir' $cmd[1]
+        and string match -q -- '--schemadir' $cmd[1]
         # TODO: This needs to support proper expansion of paths (~, variables, etc.)
         set schemadir --schemadir $cmd[2]
         set -e cmd[1..2]
@@ -56,15 +56,15 @@ function __fish_complete_gsettings_args
         set -l key_type $range[1]
         set -e range[1]
         switch $key_type
-        case 'type b'
-            echo true
-            echo false
-        case 'enum'
-            string join \n $range
-        case '*'
-            # If no sensible suggestions can be made, just use the current value.
-            # It gives a good indication on the expected format and is likely already close to what the user wants.
-            gsettings $schemadir get $schema $key 2>/dev/null
+            case 'type b'
+                echo true
+                echo false
+            case 'enum'
+                string join \n $range
+            case '*'
+                # If no sensible suggestions can be made, just use the current value.
+                # It gives a good indication on the expected format and is likely already close to what the user wants.
+                gsettings $schemadir get $schema $key 2>/dev/null
         end
         return 0
     end
diff --git a/share/completions/gv.fish b/share/completions/gv.fish
index 4f662aba9..1afc24d94 100644
--- a/share/completions/gv.fish
+++ b/share/completions/gv.fish
@@ -2,49 +2,49 @@ complete -c gv -xa "(__fish_complete_suffix .ps)"
 complete -c gv -xa "(__fish_complete_suffix .ps.gz)"
 complete -c gv -xa "(__fish_complete_suffix .eps)"
 complete -c gv -xa "(__fish_complete_suffix .pdf)"
-complete -c gv -l monochrome   -d 'Display document using only black and white'
-complete -c gv -l grayscale    -d 'Display document without colors'
-complete -c gv -l color        -d 'Display document as usual'
-complete -c gv -l safer        -d 'Start ghostscript in safe mode'
-complete -c gv -l nosafer      -d 'Do not start ghostscript in safe mode'
-complete -c gv -l safedir      -d 'Start ghostscript from a safe diretory'
-complete -c gv -l nosafedir    -d 'Do not start ghostscript from a safe diretory'
-complete -c gv -l quiet        -d 'Start ghostscript with the -dQUIET option'
-complete -c gv -l noquiet      -d 'Do not start ghostscript with the -dQUIET option'
-complete -c gv -l infoSilent   -d 'Do not show any messages in the info popup window'
-complete -c gv -l infoErrors   -d 'Do not show warning messages in the info popup window'
-complete -c gv -l infoAll      -d 'Do show all messages in the info popup window'
-complete -c gv -l arguments    -d 'Start ghostscript with additional options as specified by the string ARGS' -x
-complete -c gv -l page         -d 'Display the page with label LABEL first' -x
-complete -c gv -l center       -d 'The page should be centered automatically'
-complete -c gv -l nocenter     -d 'The page should not be centered automatically'
-complete -c gv -l media        -d 'Selects the paper size to be used'
-complete -c gv -l orientation  -d 'Sets the orientation of the page' -xa 'automatic bbox letter legal statement tabloid ledger folio quatro 10x14 executive a3 a4 a5 b4 b5'
-complete -c gv -l scale        -d 'Selects the scale N, or arbitrary scale f.f' -x
-complete -c gv -l scalebase    -d 'Selects the scale base N' -x
-complete -c gv -l swap         -d 'Interchange the meaning of the orientations landscape and seascape'
-complete -c gv -l noswap       -d 'Do not interchange the meaning of the orientation landscape and seascape'
-complete -c gv -l antialias    -d 'Use antialiasing'
-complete -c gv -l noantialias  -d 'Do not use antialiasing'
-complete -c gv -l dsc          -d 'Dsc comments are respected'
-complete -c gv -l nodsc        -d 'Dsc comments are not respected'
-complete -c gv -l eof          -d 'Ignore the postscript EOF comment while scanning documents'
-complete -c gv -l noeof        -d 'Do not ignore the postscript EOF comment while scanning documents'
-complete -c gv -l pixmap       -d 'Use backing pixmap'
-complete -c gv -l nopixmap     -d 'Do not use backing pixmap'
-complete -c gv -l watch        -d 'Watch the document file for changes'
-complete -c gv -l nowatch      -d 'Do not watch the document file for changes'
-complete -c gv -l help         -d 'Print a help message and exit'
-complete -c gv -l usage        -d 'Print a usage message and exit'
-complete -c gv -l resize       -d 'Fit the size of the window to the size of the page'
-complete -c gv -l noresize     -d 'Do not fit the size of the window to the size of the page'
-complete -c gv -o geometry     -d 'Set geometry'
-complete -c gv -l ad           -d 'Read and use additional resources from FILE (higher priority)' -r
-complete -c gv -l style        -d 'Read and use additional resources from FILE (lower priority)' -r
-complete -c gv -l password     -d 'Sets the password for opening encrypted PDF files' -x
-complete -c gv -l spartan      -d 'Shortcut for --style=gv_spartan.dat'
-complete -c gv -l widgetless   -d 'Shortcut for --style=gv_widgetless.dat'
-complete -c gv -l fullscreen   -d 'Start in fullscreen mode (needs support from WM)'
+complete -c gv -l monochrome -d 'Display document using only black and white'
+complete -c gv -l grayscale -d 'Display document without colors'
+complete -c gv -l color -d 'Display document as usual'
+complete -c gv -l safer -d 'Start ghostscript in safe mode'
+complete -c gv -l nosafer -d 'Do not start ghostscript in safe mode'
+complete -c gv -l safedir -d 'Start ghostscript from a safe diretory'
+complete -c gv -l nosafedir -d 'Do not start ghostscript from a safe diretory'
+complete -c gv -l quiet -d 'Start ghostscript with the -dQUIET option'
+complete -c gv -l noquiet -d 'Do not start ghostscript with the -dQUIET option'
+complete -c gv -l infoSilent -d 'Do not show any messages in the info popup window'
+complete -c gv -l infoErrors -d 'Do not show warning messages in the info popup window'
+complete -c gv -l infoAll -d 'Do show all messages in the info popup window'
+complete -c gv -l arguments -d 'Start ghostscript with additional options as specified by the string ARGS' -x
+complete -c gv -l page -d 'Display the page with label LABEL first' -x
+complete -c gv -l center -d 'The page should be centered automatically'
+complete -c gv -l nocenter -d 'The page should not be centered automatically'
+complete -c gv -l media -d 'Selects the paper size to be used'
+complete -c gv -l orientation -d 'Sets the orientation of the page' -xa 'automatic bbox letter legal statement tabloid ledger folio quatro 10x14 executive a3 a4 a5 b4 b5'
+complete -c gv -l scale -d 'Selects the scale N, or arbitrary scale f.f' -x
+complete -c gv -l scalebase -d 'Selects the scale base N' -x
+complete -c gv -l swap -d 'Interchange the meaning of the orientations landscape and seascape'
+complete -c gv -l noswap -d 'Do not interchange the meaning of the orientation landscape and seascape'
+complete -c gv -l antialias -d 'Use antialiasing'
+complete -c gv -l noantialias -d 'Do not use antialiasing'
+complete -c gv -l dsc -d 'Dsc comments are respected'
+complete -c gv -l nodsc -d 'Dsc comments are not respected'
+complete -c gv -l eof -d 'Ignore the postscript EOF comment while scanning documents'
+complete -c gv -l noeof -d 'Do not ignore the postscript EOF comment while scanning documents'
+complete -c gv -l pixmap -d 'Use backing pixmap'
+complete -c gv -l nopixmap -d 'Do not use backing pixmap'
+complete -c gv -l watch -d 'Watch the document file for changes'
+complete -c gv -l nowatch -d 'Do not watch the document file for changes'
+complete -c gv -l help -d 'Print a help message and exit'
+complete -c gv -l usage -d 'Print a usage message and exit'
+complete -c gv -l resize -d 'Fit the size of the window to the size of the page'
+complete -c gv -l noresize -d 'Do not fit the size of the window to the size of the page'
+complete -c gv -o geometry -d 'Set geometry'
+complete -c gv -l ad -d 'Read and use additional resources from FILE (higher priority)' -r
+complete -c gv -l style -d 'Read and use additional resources from FILE (lower priority)' -r
+complete -c gv -l password -d 'Sets the password for opening encrypted PDF files' -x
+complete -c gv -l spartan -d 'Shortcut for --style=gv_spartan.dat'
+complete -c gv -l widgetless -d 'Shortcut for --style=gv_widgetless.dat'
+complete -c gv -l fullscreen -d 'Start in fullscreen mode (needs support from WM)'
 complete -c gv -l presentation -d 'Presentation mode '
-complete -c gv -l version      -d 'Show gv version and exit'
+complete -c gv -l version -d 'Show gv version and exit'
 
diff --git a/share/completions/head.fish b/share/completions/head.fish
index 9539a392c..ab304d01e 100644
--- a/share/completions/head.fish
+++ b/share/completions/head.fish
@@ -1,11 +1,11 @@
 if head --version >/dev/null 2>/dev/null
-	complete -c head -s c -l bytes -d 'Print the first N bytes; Leading '-', truncate the last N bytes' -r
-	complete -c head -s n -l lines -d 'Print the first N lines; Leading '-', truncate the last N lines' -r
-	complete -c head -s q -l quiet -l silent -d 'Never print file names'
-	complete -c head -s v -l verbose -d 'Always print file names'
-	complete -f -c head -l version -d 'Display version'
-	complete -f -c head -l help -d 'Display help'
+    complete -c head -s c -l bytes -d 'Print the first N bytes; Leading '-', truncate the last N bytes' -r
+    complete -c head -s n -l lines -d 'Print the first N lines; Leading '-', truncate the last N lines' -r
+    complete -c head -s q -l quiet -l silent -d 'Never print file names'
+    complete -c head -s v -l verbose -d 'Always print file names'
+    complete -f -c head -l version -d 'Display version'
+    complete -f -c head -l help -d 'Display help'
 else # OSX and similar - no longopts (and fewer shortopts)
-	complete -c head -s c -d 'Print the first N bytes' -r
-	complete -c head -s n -d 'Print the first N lines' -r
+    complete -c head -s c -d 'Print the first N bytes' -r
+    complete -c head -s n -d 'Print the first N lines' -r
 end
diff --git a/share/completions/help.fish b/share/completions/help.fish
index 2ff41eb76..a262eeeb1 100644
--- a/share/completions/help.fish
+++ b/share/completions/help.fish
@@ -1,5 +1,5 @@
 if test -d "$__fish_data_dir/man/man1/"
-	complete -c help -x -a '(__fish_print_commands)' -d 'Help for this command'
+    complete -c help -x -a '(__fish_print_commands)' -d 'Help for this command'
 end
 
 # Help topics
diff --git a/share/completions/heroku.fish b/share/completions/heroku.fish
index ae46b8ef5..fba361414 100644
--- a/share/completions/heroku.fish
+++ b/share/completions/heroku.fish
@@ -107,7 +107,7 @@ complete $heroku_looking -xa addons:upgrade -d 'upgrade an existing addon'
 complete -c heroku -n '__fish_heroku_using_command addons:upgrade' -fa '(__fish_list_installed_addons)'
 
 # Apps options and subcommands
-complete -c heroku -n '__fish_heroku_using_command apps' -s o -l org -l ORG    -d "the org to list the apps for"
+complete -c heroku -n '__fish_heroku_using_command apps' -s o -l org -l ORG -d "the org to list the apps for"
 complete -c heroku -n '__fish_heroku_using_command apps' -s A -l all -d "list all apps in the org. Not just joined apps"
 complete -c heroku -n '__fish_heroku_using_command apps' -s p -l personal -d "list apps in personal account when a default org is set"
 
diff --git a/share/completions/hg.fish b/share/completions/hg.fish
index de772ef26..3bafe3832 100644
--- a/share/completions/hg.fish
+++ b/share/completions/hg.fish
@@ -375,7 +375,7 @@ function __fish_hg_using_command --argument-names cmd
 end
 
 function __fish_hg_needs_command
-    not __fish_hg_get_command > /dev/null
+    not __fish_hg_get_command >/dev/null
 end
 
 # global options
diff --git a/share/completions/highlight.fish b/share/completions/highlight.fish
index 5c788cc47..5a34862b7 100644
--- a/share/completions/highlight.fish
+++ b/share/completions/highlight.fish
@@ -1,8 +1,8 @@
 
 complete -c highlight -s O -l out-format -d 'Output file in given format' -xa 'xterm256 latex tex rtf html xhtml ansi bbcode svg'
-complete -c highlight -s t -l tab        -d 'Specify tab length' -x
-complete -c highlight -s i -l input      -d 'Name of the input file' -r
-complete -c highlight -s o -l output     -d 'Name of the output file' -r
-complete -c highlight -s d -l outdir     -d 'Output directory' -r
-complete -c highlight -s S -l syntax     -d 'Set type of the source code' -xa "(highlight -p | sed -r 's/^(.*\S)\s+:\s*(\S+).*\$/\2\t\1/; /^\$/d')"
-complete -c highlight -s s -l style      -d 'Highlight style' -xa "(highlight --list-themes | sed '/^\$\| /d')"
+complete -c highlight -s t -l tab -d 'Specify tab length' -x
+complete -c highlight -s i -l input -d 'Name of the input file' -r
+complete -c highlight -s o -l output -d 'Name of the output file' -r
+complete -c highlight -s d -l outdir -d 'Output directory' -r
+complete -c highlight -s S -l syntax -d 'Set type of the source code' -xa "(highlight -p | sed -r 's/^(.*\S)\s+:\s*(\S+).*\$/\2\t\1/; /^\$/d')"
+complete -c highlight -s s -l style -d 'Highlight style' -xa "(highlight --list-themes | sed '/^\$\| /d')"
diff --git a/share/completions/hugo.fish b/share/completions/hugo.fish
index 565e40a5f..db993bd54 100644
--- a/share/completions/hugo.fish
+++ b/share/completions/hugo.fish
@@ -9,8 +9,8 @@ function __fish_hugo_command
     set -l skip 1
     for token in $tokens[2..-1]
         if test $skip -eq 0
-        	set skip 1
-		else
+            set skip 1
+        else
             switch $token
                 case "--config" "--logFile"
                     set skip 0
@@ -40,61 +40,61 @@ end
 
 # Global options
 
-complete -c hugo      -l config     -f -d "Configuration file"
-complete -c hugo      -l debug      -f -d "Debug output"
-complete -c hugo      -l log        -f -d "Enable logging"
-complete -c hugo      -l logFile    -r -d "Log file"
-complete -c hugo      -l quiet      -f -d "Quiet mode"
-complete -c hugo -s v -l verbose    -f -d "Verbose output"
-complete -c hugo      -l verboseLog -f -d "Verbose logging"
+complete -c hugo -l config -f -d "Configuration file"
+complete -c hugo -l debug -f -d "Debug output"
+complete -c hugo -l log -f -d "Enable logging"
+complete -c hugo -l logFile -r -d "Log file"
+complete -c hugo -l quiet -f -d "Quiet mode"
+complete -c hugo -s v -l verbose -f -d "Verbose output"
+complete -c hugo -l verboseLog -f -d "Verbose logging"
 
 # Main-like commands
 
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s b -l baseURL               -r -d "Hostname and path to the root"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s B -l buildDrafts           -f -d "Include content marked as draft"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s E -l buildExpired          -f -d "Include expired content"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s F -l buildFuture           -f -d "Include content with publishdate in the future"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l cacheDir              -f -a "(__fish_complete_directories (commandline -ct) 'Cache directory')" -d "Cache directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l canonifyURLs          -f -d "Canonicalize all relative URLs using baseurl"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l cleanDestinationDir   -f -d "Remove files from destination not found in static directories"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s c -l contentDir            -f -a "(__fish_complete_directories (commandline -ct) 'Content directory')" -d "Content directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s d -l destination           -f -a "(__fish_complete_directories (commandline -ct) 'Destination directory')" -d "Destination directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l disable404            -f -d "Do not build 404 page"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l disableKinds          -r -d "Disable different kinds of pages"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l disableRSS            -f -d "Do not build RSS files"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l disableSitemap        -f -d "Do not build sitemap files"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l enableGitInfo         -f -d "Add Git revision, date and author info to the pages"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l forceSyncStatic       -f -d "Copy all files when static is changed"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s h -l help                  -f -d "Help for hugo"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l i18n-warnings         -f -d "Print missing translations"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l ignoreCache           -f -d "Ignore the cache directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s l -l layoutDir             -f -a "(__fish_complete_directories (commandline -ct) 'Layout directory')" -d "Layout directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l noChmod               -f -d "Do not sync permission mode of files"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l noTimes               -f -d "Do not sync modification time of files"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l pluralizeListTitles   -f -d "Pluralize titles in lists using inflect"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l preserveTaxonomyNames -f -d "Preserve taxonomy names as written"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l renderToMemory        -f -d "Render to memory"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s s -l source                -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l stepAnalysis          -f -d "Display memory and timing of different steps of the program"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l templateMetrics       -f -d "Display metrics about template executions"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l templateMetricsHints  -f -d "Calculate some improvement hints when combined with --templateMetrics"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s t -l theme                 -r -d "Theme to use"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l themesDir             -f -a "(__fish_complete_directories (commandline -ct) 'Themes directory')" -d "Themes directory"
-complete -c hugo -n "__fish_hugo_using_main_like_command"      -l uglyURLs              -f -d "Use /filename.html instead of /filename/"
-complete -c hugo -n "__fish_hugo_using_main_like_command" -s w -l watch                 -f -d "Watch filesystem for changes and recreate as needed"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s b -l baseURL -r -d "Hostname and path to the root"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s B -l buildDrafts -f -d "Include content marked as draft"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s E -l buildExpired -f -d "Include expired content"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s F -l buildFuture -f -d "Include content with publishdate in the future"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l cacheDir -f -a "(__fish_complete_directories (commandline -ct) 'Cache directory')" -d "Cache directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l canonifyURLs -f -d "Canonicalize all relative URLs using baseurl"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l cleanDestinationDir -f -d "Remove files from destination not found in static directories"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s c -l contentDir -f -a "(__fish_complete_directories (commandline -ct) 'Content directory')" -d "Content directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s d -l destination -f -a "(__fish_complete_directories (commandline -ct) 'Destination directory')" -d "Destination directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l disable404 -f -d "Do not build 404 page"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l disableKinds -r -d "Disable different kinds of pages"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l disableRSS -f -d "Do not build RSS files"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l disableSitemap -f -d "Do not build sitemap files"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l enableGitInfo -f -d "Add Git revision, date and author info to the pages"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l forceSyncStatic -f -d "Copy all files when static is changed"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s h -l help -f -d "Help for hugo"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l i18n-warnings -f -d "Print missing translations"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l ignoreCache -f -d "Ignore the cache directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s l -l layoutDir -f -a "(__fish_complete_directories (commandline -ct) 'Layout directory')" -d "Layout directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l noChmod -f -d "Do not sync permission mode of files"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l noTimes -f -d "Do not sync modification time of files"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l pluralizeListTitles -f -d "Pluralize titles in lists using inflect"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l preserveTaxonomyNames -f -d "Preserve taxonomy names as written"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l renderToMemory -f -d "Render to memory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l stepAnalysis -f -d "Display memory and timing of different steps of the program"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l templateMetrics -f -d "Display metrics about template executions"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l templateMetricsHints -f -d "Calculate some improvement hints when combined with --templateMetrics"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s t -l theme -r -d "Theme to use"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l themesDir -f -a "(__fish_complete_directories (commandline -ct) 'Themes directory')" -d "Themes directory"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -l uglyURLs -f -d "Use /filename.html instead of /filename/"
+complete -c hugo -n "__fish_hugo_using_main_like_command" -s w -l watch -f -d "Watch filesystem for changes and recreate as needed"
 
 # Commands
 
 # benchmark
 complete -c hugo -n "not __fish_hugo_command" -f -a benchmark -d "Benchmark Hugo by building the site a number of times"
-complete -c hugo -n "__fish_hugo_using_command benchmark" -s n -l count                -f -d "Number of times to build the site"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l cpuprofile           -r -d "CPU profile file"
-complete -c hugo -n "__fish_hugo_using_command benchmark" -s h -l help                 -f -d "Help for benchmark"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l memprofile           -r -d "Memory profile file"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l renderToMemory       -f -d "Render to memory"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l stepAnalysis         -f -d "Display memory and timing of different steps of the program"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l templateMetrics      -f -d "Display metrics about template executions"
-complete -c hugo -n "__fish_hugo_using_command benchmark"      -l templateMetricsHints -f -d "Calculate some improvement hints when combined with --templateMetrics"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -s n -l count -f -d "Number of times to build the site"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l cpuprofile -r -d "CPU profile file"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -s h -l help -f -d "Help for benchmark"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l memprofile -r -d "Memory profile file"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l renderToMemory -f -d "Render to memory"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l stepAnalysis -f -d "Display memory and timing of different steps of the program"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l templateMetrics -f -d "Display metrics about template executions"
+complete -c hugo -n "__fish_hugo_using_command benchmark" -l templateMetricsHints -f -d "Calculate some improvement hints when combined with --templateMetrics"
 
 # check
 complete -c hugo -n "not __fish_hugo_command" -f -a check -d "Perform some verification checks"
@@ -110,10 +110,10 @@ complete -c hugo -n "__fish_hugo_using_command config" -s h -l help -f -d "Help
 
 # convert
 complete -c hugo -n "not __fish_hugo_command" -f -a convert -d "Convert the content to different formats"
-complete -c hugo -n "__fish_hugo_using_command convert" -s h -l help   -f -d "Help for convert"
+complete -c hugo -n "__fish_hugo_using_command convert" -s h -l help -f -d "Help for convert"
 complete -c hugo -n "__fish_hugo_using_command convert" -s o -l output -f -a "(__fish_complete_directories (commandline -ct) 'Output directory')" -d "Output directory"
 complete -c hugo -n "__fish_hugo_using_command convert" -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
-complete -c hugo -n "__fish_hugo_using_command convert"      -l unsafe -f -d "Enable less safe operations"
+complete -c hugo -n "__fish_hugo_using_command convert" -l unsafe -f -d "Enable less safe operations"
 
 # convert toJSON
 complete -c hugo -n "__fish_hugo_using_command convert" -f -a toJSON -d "Convert front matter to JSON"
@@ -137,40 +137,40 @@ complete -c hugo -n "__fish_hugo_using_command gen" -s h -l help -f -d "Help for
 
 # gen autocomplete
 complete -c hugo -n "__fish_hugo_using_command gen" -f -a autocomplete -d "Generate shell autocompletion script for Hugo"
-complete -c hugo -n "__fish_hugo_using_command gen autocomplete"      -l completionfile -r -d "Autocompletion file"
-complete -c hugo -n "__fish_hugo_using_command gen autocomplete" -s h -l help           -f -d "Help for autocomplete"
-complete -c hugo -n "__fish_hugo_using_command gen autocomplete"      -l type           -f -a bash -d "Autocompletion type"
+complete -c hugo -n "__fish_hugo_using_command gen autocomplete" -l completionfile -r -d "Autocompletion file"
+complete -c hugo -n "__fish_hugo_using_command gen autocomplete" -s h -l help -f -d "Help for autocomplete"
+complete -c hugo -n "__fish_hugo_using_command gen autocomplete" -l type -f -a bash -d "Autocompletion type"
 
 # gen chromastyles
 complete -c hugo -n "__fish_hugo_using_command gen" -f -a chromastyles -d "Generate CSS stylesheet for the Chroma code highlighter"
-complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -s h -l help           -f -d "Help for chromastyles"
-complete -c hugo -n "__fish_hugo_using_command gen chromastyles"      -l highlightStyle -r -d "Style used for highlighting lines"
-complete -c hugo -n "__fish_hugo_using_command gen chromastyles"      -l lineStyle      -r -d "Style used for line numbers"
-complete -c hugo -n "__fish_hugo_using_command gen chromastyles"      -l style          -r -d "Highlighter style"
+complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -s h -l help -f -d "Help for chromastyles"
+complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -l highlightStyle -r -d "Style used for highlighting lines"
+complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -l lineStyle -r -d "Style used for line numbers"
+complete -c hugo -n "__fish_hugo_using_command gen chromastyles" -l style -r -d "Highlighter style"
 
 # gen doc
 complete -c hugo -n "__fish_hugo_using_command gen" -f -a doc -d "Generate Markdown documentation for the Hugo CLI"
-complete -c hugo -n "__fish_hugo_using_command gen doc"      -l dir  -f -a "(__fish_complete_directories (commandline -ct) 'Doc directory')" -d "Doc directory"
+complete -c hugo -n "__fish_hugo_using_command gen doc" -l dir -f -a "(__fish_complete_directories (commandline -ct) 'Doc directory')" -d "Doc directory"
 complete -c hugo -n "__fish_hugo_using_command gen doc" -s h -l help -f -d "Help for doc"
 
 # gen man
 complete -c hugo -n "__fish_hugo_using_command gen" -f -a man -d "Generate man pages for the Hugo CLI"
-complete -c hugo -n "__fish_hugo_using_command gen man"      -l dir  -f -a "(__fish_complete_directories (commandline -ct) 'Man pages directory')" -d "Man pages directory"
+complete -c hugo -n "__fish_hugo_using_command gen man" -l dir -f -a "(__fish_complete_directories (commandline -ct) 'Man pages directory')" -d "Man pages directory"
 complete -c hugo -n "__fish_hugo_using_command gen man" -s h -l help -f -d "Help for man"
 
 # import
 complete -c hugo -n "not __fish_hugo_command" -f -a import -d "Import your site from others"
-complete -c hugo -n "__fish_hugo_using_command import" -s h -l help   -f -d "Help for import"
+complete -c hugo -n "__fish_hugo_using_command import" -s h -l help -f -d "Help for import"
 
 # import jekyll
 complete -c hugo -n "__fish_hugo_using_command import" -f -a jekyll -d "Import from Jekyll"
-complete -c hugo -n "__fish_hugo_using_command import jekyll"      -l force -f -d "Allow import into non-empty target directory"
-complete -c hugo -n "__fish_hugo_using_command import jekyll" -s h -l help  -f -d "Help for jekyll"
+complete -c hugo -n "__fish_hugo_using_command import jekyll" -l force -f -d "Allow import into non-empty target directory"
+complete -c hugo -n "__fish_hugo_using_command import jekyll" -s h -l help -f -d "Help for jekyll"
 
 # list
 complete -c hugo -n "not __fish_hugo_command" -f -a list -d "List various types of content"
-complete -c hugo -n "__fish_hugo_using_command list" -s h -l help    -f -d "Help for list"
-complete -c hugo -n "__fish_hugo_using_command list" -s s -l source  -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
+complete -c hugo -n "__fish_hugo_using_command list" -s h -l help -f -d "Help for list"
+complete -c hugo -n "__fish_hugo_using_command list" -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
 
 # list drafts
 complete -c hugo -n "__fish_hugo_using_command list" -f -a drafts -d "List all drafts"
@@ -186,16 +186,16 @@ complete -c hugo -n "__fish_hugo_using_command list future" -s h -l help -f -d "
 
 # new
 complete -c hugo -n "not __fish_hugo_command" -f -a new -d "Create new content"
-complete -c hugo -n "__fish_hugo_using_command new"      -l editor -r -d "Editor to use"
-complete -c hugo -n "__fish_hugo_using_command new" -s h -l help   -f -d "Help for new"
-complete -c hugo -n "__fish_hugo_using_command new" -s k -l kind   -r -d "Content type to create"
+complete -c hugo -n "__fish_hugo_using_command new" -l editor -r -d "Editor to use"
+complete -c hugo -n "__fish_hugo_using_command new" -s h -l help -f -d "Help for new"
+complete -c hugo -n "__fish_hugo_using_command new" -s k -l kind -r -d "Content type to create"
 complete -c hugo -n "__fish_hugo_using_command new" -s s -l source -f -a "(__fish_complete_directories (commandline -ct) 'Source directory')" -d "Source directory"
 
 # new site
 complete -c hugo -n "__fish_hugo_using_command new" -f -a site -d "Create a new site"
-complete -c hugo -n "__fish_hugo_using_command new site"      -l force  -f -d "Create site inside non-empty directory"
+complete -c hugo -n "__fish_hugo_using_command new site" -l force -f -d "Create site inside non-empty directory"
 complete -c hugo -n "__fish_hugo_using_command new site" -s f -l format -r -d "Config and front matter format"
-complete -c hugo -n "__fish_hugo_using_command new site" -s h -l help   -f -d "Help for site"
+complete -c hugo -n "__fish_hugo_using_command new site" -s h -l help -f -d "Help for site"
 
 # new theme
 complete -c hugo -n "__fish_hugo_using_command new" -f -a theme -d "Create a new theme"
@@ -203,18 +203,18 @@ complete -c hugo -n "__fish_hugo_using_command new theme" -s h -l help -f -d "He
 
 # server
 complete -c hugo -n "not __fish_hugo_command" -f -a server -d "Start high performance web server"
-complete -c hugo -n "__fish_hugo_using_command server"      -l appendPort        -f -d "Append port to baseurl"
-complete -c hugo -n "__fish_hugo_using_command server"      -l bind              -r -d "Interface to which the server will bind"
-complete -c hugo -n "__fish_hugo_using_command server"      -l disableFastRender -f -d "Enable full re-renders on changes"
-complete -c hugo -n "__fish_hugo_using_command server"      -l disableLiveReload -f -d "Watch without enabling live browser reload on rebuild"
-complete -c hugo -n "__fish_hugo_using_command server" -s h -l help              -f -d "Help for server"
-complete -c hugo -n "__fish_hugo_using_command server"      -l liveReloadPort    -r -d "Port for live reloading"
-complete -c hugo -n "__fish_hugo_using_command server"      -l meminterval       -f -d "Interval to poll memory usage"
-complete -c hugo -n "__fish_hugo_using_command server"      -l memstats          -f -d "Memory usage log file"
-complete -c hugo -n "__fish_hugo_using_command server"      -l navigateToChanged -f -d "Navigate to changed content file on live browser reload"
-complete -c hugo -n "__fish_hugo_using_command server"      -l noHTTPCache       -f -d "Prevent HTTP caching"
-complete -c hugo -n "__fish_hugo_using_command server" -s p -l port              -r -d "Port on which the server will listen"
-complete -c hugo -n "__fish_hugo_using_command server"      -l renderToDisk      -r -d "Render to destination directory"
+complete -c hugo -n "__fish_hugo_using_command server" -l appendPort -f -d "Append port to baseurl"
+complete -c hugo -n "__fish_hugo_using_command server" -l bind -r -d "Interface to which the server will bind"
+complete -c hugo -n "__fish_hugo_using_command server" -l disableFastRender -f -d "Enable full re-renders on changes"
+complete -c hugo -n "__fish_hugo_using_command server" -l disableLiveReload -f -d "Watch without enabling live browser reload on rebuild"
+complete -c hugo -n "__fish_hugo_using_command server" -s h -l help -f -d "Help for server"
+complete -c hugo -n "__fish_hugo_using_command server" -l liveReloadPort -r -d "Port for live reloading"
+complete -c hugo -n "__fish_hugo_using_command server" -l meminterval -f -d "Interval to poll memory usage"
+complete -c hugo -n "__fish_hugo_using_command server" -l memstats -f -d "Memory usage log file"
+complete -c hugo -n "__fish_hugo_using_command server" -l navigateToChanged -f -d "Navigate to changed content file on live browser reload"
+complete -c hugo -n "__fish_hugo_using_command server" -l noHTTPCache -f -d "Prevent HTTP caching"
+complete -c hugo -n "__fish_hugo_using_command server" -s p -l port -r -d "Port on which the server will listen"
+complete -c hugo -n "__fish_hugo_using_command server" -l renderToDisk -r -d "Render to destination directory"
 
 # undraft
 complete -c hugo -n "not __fish_hugo_command" -f -a undraft -d "Reset the content draft status"
diff --git a/share/completions/identify.fish b/share/completions/identify.fish
index 0d56fe3d2..f4ae7c5e7 100644
--- a/share/completions/identify.fish
+++ b/share/completions/identify.fish
@@ -1,33 +1,33 @@
-complete -c identify -o antialias                   -d 'Remove pixel-aliasing '
-complete -c identify -o authenticate                -d 'Decrypt image with this password [value]'
-complete -c identify -o channel                     -d 'Apply option to select image channels [type]' -xa '(identify -list channel)'
-complete -c identify -o crop                        -d 'Cut out a rectangular region of the image [geometry]'
-complete -c identify -o define                      -d 'Define one or more image format options [format:option]'
-complete -c identify -o density                     -d 'Horizontal and vertical density of the image [geometry]'
-complete -c identify -o depth                       -d 'Image depth [value]'
-complete -c identify -o extract                     -d 'Extract area from image [geometry]'
-complete -c identify -o features                    -d 'Display image features (e.g. contrast, correlation) [distance]'
-complete -c identify -o format                      -d 'Output formatted image characteristics ["string"]'
-complete -c identify -o fuzz                        -d 'Colors within this distance are considered equal [distance]'
-complete -c identify -o interlace                   -d 'Type of image interlacing scheme [type]' -xa '(identify -list interlace)'
-complete -c identify -o interpolate                 -d 'Pixel color interpolation method [method]' -xa '(identify -list interpolate)'
-complete -c identify -o limit                       -d 'Pixel cache resource limit [type value]' -x
-complete -c identify -o list                        -d 'Color, Configure, Delegate, Format, Magic, Module, Resource, or Type [type]' -xa '(identify -list list)'
-complete -c identify -o matte                       -d 'Store matte channel if the image has one'
-complete -c identify -o monitor                     -d 'Monitor progress '
-complete -c identify -o ping                        -d 'Efficiently determine image attributes'
-complete -c identify -o quiet                       -d 'Suppress all warning messages'
-complete -c identify -o regard-warnings             -d 'Pay attention to warning messages'
-complete -c identify -o sampling-factor             -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c identify -o seed                        -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c identify -o set                         -d 'Attribute set an image attribute [ value]'
-complete -c identify -o size                        -d 'Width and height of image [geometry]'
-complete -c identify -o strip                       -d 'Strip image of all profiles and comments'
-complete -c identify -o unique                      -d 'Display the number of unique colors in the image'
-complete -c identify -o units                       -d 'The units of image resolution [type]' -xa '(identify -list units)'
-complete -c identify -o verbose                     -d 'Print detailed information about the image'
-complete -c identify -o virtual-pixel               -d 'Virtual pixel access method [method]' -xa '(identify -list virtual-pixel)'
-complete -c identify -o negate                      -d 'Replace each pixel with its complementary color'
-complete -c identify -o debug                       -d 'Display copious debugging information [events]' -xa '(identify -list debug)'
-complete -c identify -o help                        -d 'Print program options'
-complete -c identify -o log                         -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c identify -o antialias -d 'Remove pixel-aliasing '
+complete -c identify -o authenticate -d 'Decrypt image with this password [value]'
+complete -c identify -o channel -d 'Apply option to select image channels [type]' -xa '(identify -list channel)'
+complete -c identify -o crop -d 'Cut out a rectangular region of the image [geometry]'
+complete -c identify -o define -d 'Define one or more image format options [format:option]'
+complete -c identify -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c identify -o depth -d 'Image depth [value]'
+complete -c identify -o extract -d 'Extract area from image [geometry]'
+complete -c identify -o features -d 'Display image features (e.g. contrast, correlation) [distance]'
+complete -c identify -o format -d 'Output formatted image characteristics ["string"]'
+complete -c identify -o fuzz -d 'Colors within this distance are considered equal [distance]'
+complete -c identify -o interlace -d 'Type of image interlacing scheme [type]' -xa '(identify -list interlace)'
+complete -c identify -o interpolate -d 'Pixel color interpolation method [method]' -xa '(identify -list interpolate)'
+complete -c identify -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c identify -o list -d 'Color, Configure, Delegate, Format, Magic, Module, Resource, or Type [type]' -xa '(identify -list list)'
+complete -c identify -o matte -d 'Store matte channel if the image has one'
+complete -c identify -o monitor -d 'Monitor progress '
+complete -c identify -o ping -d 'Efficiently determine image attributes'
+complete -c identify -o quiet -d 'Suppress all warning messages'
+complete -c identify -o regard-warnings -d 'Pay attention to warning messages'
+complete -c identify -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c identify -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c identify -o set -d 'Attribute set an image attribute [ value]'
+complete -c identify -o size -d 'Width and height of image [geometry]'
+complete -c identify -o strip -d 'Strip image of all profiles and comments'
+complete -c identify -o unique -d 'Display the number of unique colors in the image'
+complete -c identify -o units -d 'The units of image resolution [type]' -xa '(identify -list units)'
+complete -c identify -o verbose -d 'Print detailed information about the image'
+complete -c identify -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(identify -list virtual-pixel)'
+complete -c identify -o negate -d 'Replace each pixel with its complementary color'
+complete -c identify -o debug -d 'Display copious debugging information [events]' -xa '(identify -list debug)'
+complete -c identify -o help -d 'Print program options'
+complete -c identify -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
diff --git a/share/completions/iex.fish b/share/completions/iex.fish
index 199a53280..1396db79a 100644
--- a/share/completions/iex.fish
+++ b/share/completions/iex.fish
@@ -1,16 +1,16 @@
-complete -f -c iex -s v        -d "Prints version and exit"
-complete -f -c iex -s e        -d "Evaluates the given command"
-complete    -c iex -s r        -d "Requires the given files/patterns"
-complete    -c iex -s S        -d "Finds and executes the given script"
-complete    -c iex -s pr       -d "Requires the given files/patterns in parallel"
-complete    -c iex -s pa       -d "Prepends the given path to Erlang code path"
-complete    -c iex -s pz       -d "Appends the given path to Erlang code path"
-complete    -c iex -l app      -d "Start the given app and its dependencies"
-complete -f -c iex -l erl      -d "Switches to be passed down to erlang"
-complete -f -c iex -l name     -d "Makes and assigns a name to the distributed node"
-complete -f -c iex -l sname    -d "Makes and assigns a short name to the distributed node"
-complete -f -c iex -l cookie   -d "Sets a cookie for this distributed node"
-complete -f -c iex -l hidden   -d "Makes a hidden node"
+complete -f -c iex -s v -d "Prints version and exit"
+complete -f -c iex -s e -d "Evaluates the given command"
+complete -c iex -s r -d "Requires the given files/patterns"
+complete -c iex -s S -d "Finds and executes the given script"
+complete -c iex -s pr -d "Requires the given files/patterns in parallel"
+complete -c iex -s pa -d "Prepends the given path to Erlang code path"
+complete -c iex -s pz -d "Appends the given path to Erlang code path"
+complete -c iex -l app -d "Start the given app and its dependencies"
+complete -f -c iex -l erl -d "Switches to be passed down to erlang"
+complete -f -c iex -l name -d "Makes and assigns a name to the distributed node"
+complete -f -c iex -l sname -d "Makes and assigns a short name to the distributed node"
+complete -f -c iex -l cookie -d "Sets a cookie for this distributed node"
+complete -f -c iex -l hidden -d "Makes a hidden node"
 complete -f -c iex -l detached -d "Starts the Erlang VM detached from console"
-complete -f -c iex -l remsh    -d "Connects to a node using a remote shell"
-complete    -c iex -l dot-iex  -d "Overrides default .iex file and uses path instead; path can be empty, then no file will be loaded"
\ No newline at end of file
+complete -f -c iex -l remsh -d "Connects to a node using a remote shell"
+complete -c iex -l dot-iex -d "Overrides default .iex file and uses path instead; path can be empty, then no file will be loaded"
\ No newline at end of file
diff --git a/share/completions/ifdata.fish b/share/completions/ifdata.fish
index a1aa62955..af4a8a3e9 100644
--- a/share/completions/ifdata.fish
+++ b/share/completions/ifdata.fish
@@ -1,31 +1,31 @@
 complete -c ifdata -xa '(__fish_print_interfaces)'
-complete -c ifdata -o e   -d 'Reports interface existence via return code'
-complete -c ifdata -o p   -d 'Print out the whole config of iface'
-complete -c ifdata -o pe   -d 'Print out yes or no according to existence'
-complete -c ifdata -o pa   -d 'Print out the address'
-complete -c ifdata -o pn   -d 'Print netmask'
-complete -c ifdata -o pN   -d 'Print network address'
-complete -c ifdata -o pb   -d 'Print broadcast'
-complete -c ifdata -o pm   -d 'Print mtu'
-complete -c ifdata -o ph   -d 'Print out the hardware address'
-complete -c ifdata -o pf   -d 'Print flags'
-complete -c ifdata -o si   -d 'Print all statistics on input'
-complete -c ifdata -o sip   -d 'Print # of in packets'
-complete -c ifdata -o sib   -d 'Print # of in bytes'
-complete -c ifdata -o sie   -d 'Print # of in errors'
-complete -c ifdata -o sid   -d 'Print # of in drops'
-complete -c ifdata -o sif   -d 'Print # of in fifo overruns'
-complete -c ifdata -o sic   -d 'Print # of in compress'
-complete -c ifdata -o sim   -d 'Print # of in multicast'
-complete -c ifdata -o so   -d 'Print all statistics on output'
-complete -c ifdata -o sop   -d 'Print # of out packets'
-complete -c ifdata -o sob   -d 'Print # of out bytes'
-complete -c ifdata -o soe   -d 'Print # of out errors'
-complete -c ifdata -o sod   -d 'Print # of out drops'
-complete -c ifdata -o sof   -d 'Print # of out fifo overruns'
-complete -c ifdata -o sox   -d 'Print # of out collisions'
-complete -c ifdata -o soc   -d 'Print # of out carrier loss'
-complete -c ifdata -o som   -d 'Print # of out multicast'
-complete -c ifdata -o bips   -d 'Print # of incoming bytes per second'
-complete -c ifdata -o bops   -d 'Print # of outgoing bytes per second'
+complete -c ifdata -o e -d 'Reports interface existence via return code'
+complete -c ifdata -o p -d 'Print out the whole config of iface'
+complete -c ifdata -o pe -d 'Print out yes or no according to existence'
+complete -c ifdata -o pa -d 'Print out the address'
+complete -c ifdata -o pn -d 'Print netmask'
+complete -c ifdata -o pN -d 'Print network address'
+complete -c ifdata -o pb -d 'Print broadcast'
+complete -c ifdata -o pm -d 'Print mtu'
+complete -c ifdata -o ph -d 'Print out the hardware address'
+complete -c ifdata -o pf -d 'Print flags'
+complete -c ifdata -o si -d 'Print all statistics on input'
+complete -c ifdata -o sip -d 'Print # of in packets'
+complete -c ifdata -o sib -d 'Print # of in bytes'
+complete -c ifdata -o sie -d 'Print # of in errors'
+complete -c ifdata -o sid -d 'Print # of in drops'
+complete -c ifdata -o sif -d 'Print # of in fifo overruns'
+complete -c ifdata -o sic -d 'Print # of in compress'
+complete -c ifdata -o sim -d 'Print # of in multicast'
+complete -c ifdata -o so -d 'Print all statistics on output'
+complete -c ifdata -o sop -d 'Print # of out packets'
+complete -c ifdata -o sob -d 'Print # of out bytes'
+complete -c ifdata -o soe -d 'Print # of out errors'
+complete -c ifdata -o sod -d 'Print # of out drops'
+complete -c ifdata -o sof -d 'Print # of out fifo overruns'
+complete -c ifdata -o sox -d 'Print # of out collisions'
+complete -c ifdata -o soc -d 'Print # of out carrier loss'
+complete -c ifdata -o som -d 'Print # of out multicast'
+complete -c ifdata -o bips -d 'Print # of incoming bytes per second'
+complete -c ifdata -o bops -d 'Print # of outgoing bytes per second'
 
diff --git a/share/completions/ifup.fish b/share/completions/ifup.fish
index 8965a28ad..fb74d9218 100644
--- a/share/completions/ifup.fish
+++ b/share/completions/ifup.fish
@@ -1,2 +1,2 @@
 complete -x -c ifup -a "(__fish_print_interfaces)" -d "Network interface"
-complete -c ifup -l force  -d "force"
+complete -c ifup -l force -d "force"
diff --git a/share/completions/import.fish b/share/completions/import.fish
index 85fa2f144..bb12ab76c 100644
--- a/share/completions/import.fish
+++ b/share/completions/import.fish
@@ -1,69 +1,69 @@
-complete -c import -o adjoin                        -d 'Join images into a single multi-image file'
-complete -c import -o border                        -d 'Include window border in the output image'
-complete -c import -o channel                       -d 'Apply option to select image channels [type]' -xa '(import -list channel)'
-complete -c import -o colorspace                    -d 'Alternate image colorspace [type]' -xa '(import -list colorspace)'
-complete -c import -o comment                       -d 'Annotate image with comment [string]'
-complete -c import -o compress                      -d 'Type of pixel compression when writing the image [type]' -xa '(import -list compress)'
-complete -c import -o define                        -d 'Define one or more image format options [format:option]'
-complete -c import -o density                       -d 'Horizontal and vertical density of the image [geometry]'
-complete -c import -o depth                         -d 'Image depth [value]'
-complete -c import -o descend                       -d 'Obtain image by descending window hierarchy'
-complete -c import -o display                       -d 'X server to contact [server]'
-complete -c import -o dispose                       -d 'Layer disposal method [method]' -xa '(import -list dispose)'
-complete -c import -o dither                        -d 'Apply error diffusion to image [method]' -xa '(import -list dither)'
-complete -c import -o delay                         -d 'Display the next image after pausing [value]'
-complete -c import -o encipher                      -d 'Convert plain pixels to cipher pixels [filename]' -r
-complete -c import -o endian                        -d 'Endianness (MSB or LSB) of the image [type]' -xa '(import -list endian)'
-complete -c import -o encoding                      -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c import -o filter                        -d 'Use this filter when resizing an image [type]' -xa '(import -list filter)'
-complete -c import -o format                        -d 'Output formatted image characteristics ["string"]'
-complete -c import -o frame                         -d 'Include window manager frame'
-complete -c import -o gravity                       -d 'Direction which direction to gravitate towards'
-complete -c import -o identify                      -d 'Identify the format and characteristics of the image'
-complete -c import -o interlace                     -d 'None, Line, Plane, or Partition [type]' -xa '(import -list interlace)'
-complete -c import -o interpolate                   -d 'Pixel color interpolation method [method]' -xa '(import -list interpolate)'
-complete -c import -o label                         -d 'Assign a label to an image [string]'
-complete -c import -o limit                         -d 'Area, Disk, Map, or Memory resource limit [type value]' -x
-complete -c import -o monitor                       -d 'Monitor progress '
-complete -c import -o page                          -d 'Size and location of an image canvas [geometry]'
-complete -c import -o pause                         -d 'Seconds delay between snapshots [value]'
-complete -c import -o pointsize                     -d 'Font point size [value]'
-complete -c import -o quality                       -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c import -o quiet                         -d 'Suppress all warning messages'
-complete -c import -o regard-warnings               -d 'Pay attention to warning messages'
-complete -c import -o respect-parentheses           -d 'Settings remain in effect until parenthesis boundary'
-complete -c import -o sampling-factor               -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c import -o scene                         -d 'Image scene number [value]'
-complete -c import -o screen                        -d 'Select image from root window'
-complete -c import -o seed                          -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c import -o set                           -d 'Set an image property [property value]'
-complete -c import -o silent                        -d 'Operate silently, i.e. don\'t ring any bells '
-complete -c import -o snaps                         -d 'Number of screen snapshots [value]'
-complete -c import -o synchronize                   -d 'Synchronize image to storage device'
-complete -c import -o taint                         -d 'Declare the image as modified'
-complete -c import -o transparent-color             -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c import -o treedepth                     -d 'Color tree depth [value]'
-complete -c import -o verbose                       -d 'Print detailed information about the image'
-complete -c import -o virtual-pixel                 -d 'Constant, Edge, Mirror, or Tile [method]' -xa '(import -list virtual-pixel)'
-complete -c import -o window                        -d 'Select window with this id or name [id]' -xa 'root (__fish_print_xwindows)'
-complete -c import -o annotate                      -d 'Annotate the image with text [geometry text]'
-complete -c import -o colors                        -d 'Preferred number of colors in the image [value]'
-complete -c import -o crop                          -d 'Preferred size and location of the cropped image [geometry]'
-complete -c import -o geometry                      -d 'Preferred size or location of the image [geometry]'
-complete -c import -o help                          -d 'Print program options'
-complete -c import -o monochrome                    -d 'Transform image to black and white'
-complete -c import -o negate                        -d 'Replace every pixel with its complementary color '
-complete -c import -o repage                        -d 'Size and location of an image canvas [geometry]'
-complete -c import -o quantize                      -d 'Reduce colors in this colorspace [colorspace]' -xa '(import -list colorspace)'
-complete -c import -o resize                        -d 'Resize the image [geometry]'
-complete -c import -o rotate                        -d 'Apply Paeth rotation to the image [degrees]'
-complete -c import -o strip                         -d 'Strip image of all profiles and comments'
-complete -c import -o thumbnail                     -d 'Create a thumbnail of the image [geometry]'
-complete -c import -o transparent                   -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
-complete -c import -o trim                          -d 'Trim image edges'
-complete -c import -o type                          -d 'Image type [type]' -xa '(import -list type)'
-complete -c import -o debug                         -d 'Display copious debugging information [events]' -xa '(import -list debug)'
-complete -c import -o list                          -d 'Print a list of supported option arguments [type]' -xa '(import -list list)'
-complete -c import -o log                           -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c import -o version                       -d 'Print version information'
-complete -c import -o support                       -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c import -o adjoin -d 'Join images into a single multi-image file'
+complete -c import -o border -d 'Include window border in the output image'
+complete -c import -o channel -d 'Apply option to select image channels [type]' -xa '(import -list channel)'
+complete -c import -o colorspace -d 'Alternate image colorspace [type]' -xa '(import -list colorspace)'
+complete -c import -o comment -d 'Annotate image with comment [string]'
+complete -c import -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(import -list compress)'
+complete -c import -o define -d 'Define one or more image format options [format:option]'
+complete -c import -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c import -o depth -d 'Image depth [value]'
+complete -c import -o descend -d 'Obtain image by descending window hierarchy'
+complete -c import -o display -d 'X server to contact [server]'
+complete -c import -o dispose -d 'Layer disposal method [method]' -xa '(import -list dispose)'
+complete -c import -o dither -d 'Apply error diffusion to image [method]' -xa '(import -list dither)'
+complete -c import -o delay -d 'Display the next image after pausing [value]'
+complete -c import -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
+complete -c import -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(import -list endian)'
+complete -c import -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c import -o filter -d 'Use this filter when resizing an image [type]' -xa '(import -list filter)'
+complete -c import -o format -d 'Output formatted image characteristics ["string"]'
+complete -c import -o frame -d 'Include window manager frame'
+complete -c import -o gravity -d 'Direction which direction to gravitate towards'
+complete -c import -o identify -d 'Identify the format and characteristics of the image'
+complete -c import -o interlace -d 'None, Line, Plane, or Partition [type]' -xa '(import -list interlace)'
+complete -c import -o interpolate -d 'Pixel color interpolation method [method]' -xa '(import -list interpolate)'
+complete -c import -o label -d 'Assign a label to an image [string]'
+complete -c import -o limit -d 'Area, Disk, Map, or Memory resource limit [type value]' -x
+complete -c import -o monitor -d 'Monitor progress '
+complete -c import -o page -d 'Size and location of an image canvas [geometry]'
+complete -c import -o pause -d 'Seconds delay between snapshots [value]'
+complete -c import -o pointsize -d 'Font point size [value]'
+complete -c import -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c import -o quiet -d 'Suppress all warning messages'
+complete -c import -o regard-warnings -d 'Pay attention to warning messages'
+complete -c import -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c import -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c import -o scene -d 'Image scene number [value]'
+complete -c import -o screen -d 'Select image from root window'
+complete -c import -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c import -o set -d 'Set an image property [property value]'
+complete -c import -o silent -d 'Operate silently, i.e. don\'t ring any bells '
+complete -c import -o snaps -d 'Number of screen snapshots [value]'
+complete -c import -o synchronize -d 'Synchronize image to storage device'
+complete -c import -o taint -d 'Declare the image as modified'
+complete -c import -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c import -o treedepth -d 'Color tree depth [value]'
+complete -c import -o verbose -d 'Print detailed information about the image'
+complete -c import -o virtual-pixel -d 'Constant, Edge, Mirror, or Tile [method]' -xa '(import -list virtual-pixel)'
+complete -c import -o window -d 'Select window with this id or name [id]' -xa 'root (__fish_print_xwindows)'
+complete -c import -o annotate -d 'Annotate the image with text [geometry text]'
+complete -c import -o colors -d 'Preferred number of colors in the image [value]'
+complete -c import -o crop -d 'Preferred size and location of the cropped image [geometry]'
+complete -c import -o geometry -d 'Preferred size or location of the image [geometry]'
+complete -c import -o help -d 'Print program options'
+complete -c import -o monochrome -d 'Transform image to black and white'
+complete -c import -o negate -d 'Replace every pixel with its complementary color '
+complete -c import -o repage -d 'Size and location of an image canvas [geometry]'
+complete -c import -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(import -list colorspace)'
+complete -c import -o resize -d 'Resize the image [geometry]'
+complete -c import -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c import -o strip -d 'Strip image of all profiles and comments'
+complete -c import -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c import -o transparent -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
+complete -c import -o trim -d 'Trim image edges'
+complete -c import -o type -d 'Image type [type]' -xa '(import -list type)'
+complete -c import -o debug -d 'Display copious debugging information [events]' -xa '(import -list debug)'
+complete -c import -o list -d 'Print a list of supported option arguments [type]' -xa '(import -list list)'
+complete -c import -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c import -o version -d 'Print version information'
+complete -c import -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
diff --git a/share/completions/invoke-rc.d.fish b/share/completions/invoke-rc.d.fish
index d3f50ded6..fcccafc36 100644
--- a/share/completions/invoke-rc.d.fish
+++ b/share/completions/invoke-rc.d.fish
@@ -1,11 +1,11 @@
 
 function __fish_invoke_rcd_has_service
-  set tokens (commandline -opc)
-  if [ (count $tokens) -eq 2 ]
-    return 0
-  else
-    return 1
-  end
+    set tokens (commandline -opc)
+    if [ (count $tokens) -eq 2 ]
+        return 0
+    else
+        return 1
+    end
 end
 
 complete -f -c invoke-rc.d -n 'not __fish_invoke_rcd_has_service' -a '(__fish_print_debian_services)'
diff --git a/share/completions/ipset.fish b/share/completions/ipset.fish
index b76948cbf..294665120 100644
--- a/share/completions/ipset.fish
+++ b/share/completions/ipset.fish
@@ -1,22 +1,22 @@
 function __fish_ipset_nosubcommand
-	if __fish_seen_subcommand_from create add del test destroy list save restore flush rename swap help version
-		return 1
-	end
-	return 0
+    if __fish_seen_subcommand_from create add del test destroy list save restore flush rename swap help version
+        return 1
+    end
+    return 0
 end
 
 function __fish_ipset_needs_setname
-	if __fish_seen_subcommand_from add del test destroy list save restore flush rename swap
-		return 0
-	end
-	return 1
+    if __fish_seen_subcommand_from add del test destroy list save restore flush rename swap
+        return 0
+    end
+    return 1
 end
 
 function __fish_ipset_list_sets
-	set -l ipset_list (ipset list --name 2>/dev/null)
-	if not __fish_seen_subcommand_from $ipset_list
-		echo $ipset_list
-	end
+    set -l ipset_list (ipset list --name 2>/dev/null)
+    if not __fish_seen_subcommand_from $ipset_list
+        echo $ipset_list
+    end
 end
 
 complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'create' -d 'Create a set identified with SETNAME'
@@ -29,7 +29,7 @@ complete -c ipset --no-files --condition __fish_ipset_nosubcommand -a 'list' -d
 
 complete -c ipset --no-files --condition __fish_ipset_needs_setname -a '(__fish_ipset_list_sets)'
 
-complete -c ipset --no-files -s '!' -o 'exist' -d 'Ignore errors'
+complete -c ipset --no-files -s ! -o 'exist' -d 'Ignore errors'
 complete -c ipset --no-files -s 'o' -o 'output' -a 'plain save xml' -d 'Output format to the list command'
 complete -c ipset --no-files -s 'q' -o 'quiet' -d 'Suppress any output'
 complete -c ipset --no-files -s 'r' -o 'resolve' -d 'Enforce name lookup'
diff --git a/share/completions/j.fish b/share/completions/j.fish
index 689e338f8..a44f90987 100644
--- a/share/completions/j.fish
+++ b/share/completions/j.fish
@@ -1,10 +1,10 @@
 function __history_completions --argument limit
-	if echo $limit | string match -q ""
-	    set limit 25
-	end
+    if echo $limit | string match -q ""
+        set limit 25
+    end
 
-	set -l tokens (commandline --current-process --tokenize)
-	history --prefix (commandline) | string replace -r \^$tokens[1]\\s\* "" | head -n$limit
+    set -l tokens (commandline --current-process --tokenize)
+    history --prefix (commandline) | string replace -r \^$tokens[1]\\s\* "" | head -n$limit
 end
 
 # erase the stock autojump completions, which are no longer needed with this
diff --git a/share/completions/jhipster.fish b/share/completions/jhipster.fish
index 65633f417..2a09f47e9 100644
--- a/share/completions/jhipster.fish
+++ b/share/completions/jhipster.fish
@@ -11,27 +11,27 @@ function __fish_prog_needs_command
 end
 
 # Options
-complete -f -c jhipster -n '__fish_prog_needs_command' -s d -l debug   -d 'Enable debugger'
-complete -f -c jhipster -n '__fish_prog_needs_command' -s h -l help    -d 'Output usage information'
+complete -f -c jhipster -n '__fish_prog_needs_command' -s d -l debug -d 'Enable debugger'
+complete -f -c jhipster -n '__fish_prog_needs_command' -s h -l help -d 'Output usage information'
 complete -f -c jhipster -n '__fish_prog_needs_command' -s V -l version -d 'Output version number'
 
 # Commands
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a app             -d 'Create a new JHipster application'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a aws             -d 'Deploy the current application to AWS'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a ci-cd           -d 'Create pipeline scripts for popular CI tools'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a client          -d 'Create a new JHipster client-side application'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a cloudfoundry    -d 'Prepare Cloud Foundry deployment'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a docker-compose  -d 'Create all required Docker deployment configuration for the selected applications'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a entity          -d 'Create a new JHipster entity: JPA entity, Spring server-side components and Angular client-side components'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a export-jdl      -d 'Create a JDL file from the existing entities'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a heroku          -d 'Deploy the current application to Heroku'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a import-jdl      -d 'Create entities from the JDL file passed in argument'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a info            -d 'Display information about your current project and system'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a kubernetes      -d 'Deploy the current application to Kubernetes'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a languages       -d 'Select languages from a list of available languages. The i18n files will be copied to the /webapp/i18n folder'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a openshift       -d 'Deploy the current application to OpenShift'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a rancher-compose -d 'Deploy the current application to Rancher'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a server          -d 'Create a new JHipster server-side application'
-complete -f -c jhipster -n '__fish_prog_needs_command' -r -a service         -d 'Create a new Spring service bean'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a upgrade         -d 'Upgrade the JHipster version and the generated application'
-complete -f -c jhipster -n '__fish_prog_needs_command'    -a completion      -d 'Print command completion script'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a app -d 'Create a new JHipster application'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a aws -d 'Deploy the current application to AWS'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a ci-cd -d 'Create pipeline scripts for popular CI tools'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a client -d 'Create a new JHipster client-side application'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a cloudfoundry -d 'Prepare Cloud Foundry deployment'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a docker-compose -d 'Create all required Docker deployment configuration for the selected applications'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a entity -d 'Create a new JHipster entity: JPA entity, Spring server-side components and Angular client-side components'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a export-jdl -d 'Create a JDL file from the existing entities'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a heroku -d 'Deploy the current application to Heroku'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a import-jdl -d 'Create entities from the JDL file passed in argument'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a info -d 'Display information about your current project and system'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a kubernetes -d 'Deploy the current application to Kubernetes'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a languages -d 'Select languages from a list of available languages. The i18n files will be copied to the /webapp/i18n folder'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a openshift -d 'Deploy the current application to OpenShift'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a rancher-compose -d 'Deploy the current application to Rancher'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a server -d 'Create a new JHipster server-side application'
+complete -f -c jhipster -n '__fish_prog_needs_command' -r -a service -d 'Create a new Spring service bean'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a upgrade -d 'Upgrade the JHipster version and the generated application'
+complete -f -c jhipster -n '__fish_prog_needs_command' -a completion -d 'Print command completion script'
diff --git a/share/completions/kill.fish b/share/completions/kill.fish
index c128aacd6..c38a6926f 100644
--- a/share/completions/kill.fish
+++ b/share/completions/kill.fish
@@ -1,24 +1,24 @@
 __fish_make_completion_signals
 
 for i in $__kill_signals
-	set number (echo $i | cut -d " " -f 1)
-	set name (echo $i | cut -d " " -f 2)
-	complete -c kill -o $number -d $name
-	complete -c kill -o $name
-	complete -c kill -s s -x -a "$number $name"
+    set number (echo $i | cut -d " " -f 1)
+    set name (echo $i | cut -d " " -f 2)
+    complete -c kill -o $number -d $name
+    complete -c kill -o $name
+    complete -c kill -s s -x -a "$number $name"
 end
 
 complete -c kill -xa '(__fish_complete_pids)'
 
-if kill -L > /dev/null 2>/dev/null
-	complete -c kill -s s -l signal -d "Signal to send"
-	complete -c kill -s l -l list -d "Printf list of signal names, or name of given SIG NUMBER"
-	complete -c kill -s L -l table -d " Print signal names and their corresponding numbers"
-	complete -c kill -s a -l all -d "Do not restrict the commandname-to-pid conversion to processes with the same uid as the present process"
-	complete -c kill -s p -l pid -d "Only print pid of the named processes, do not send any signals"
-	complete -c kill -s q -l queue -d "Use sigqueue(2) rather than kill(2).  The value argument is an integer that is sent along with the signal."
-	complete -c kill -l verbos -d "Print pid(s) that will be signaled with kill along with the signal."
+if kill -L >/dev/null 2>/dev/null
+    complete -c kill -s s -l signal -d "Signal to send"
+    complete -c kill -s l -l list -d "Printf list of signal names, or name of given SIG NUMBER"
+    complete -c kill -s L -l table -d " Print signal names and their corresponding numbers"
+    complete -c kill -s a -l all -d "Do not restrict the commandname-to-pid conversion to processes with the same uid as the present process"
+    complete -c kill -s p -l pid -d "Only print pid of the named processes, do not send any signals"
+    complete -c kill -s q -l queue -d "Use sigqueue(2) rather than kill(2).  The value argument is an integer that is sent along with the signal."
+    complete -c kill -l verbos -d "Print pid(s) that will be signaled with kill along with the signal."
 else # OS X
-	complete -c kill -s s -d "Signal to send"
-	complete -c kill -s l -d "Printf list of signal names, or name of given SIG NUMBER"
+    complete -c kill -s s -d "Signal to send"
+    complete -c kill -s l -d "Printf list of signal names, or name of given SIG NUMBER"
 end
\ No newline at end of file
diff --git a/share/completions/kitchen.fish b/share/completions/kitchen.fish
index ae7f78b3d..a42faec7e 100644
--- a/share/completions/kitchen.fish
+++ b/share/completions/kitchen.fish
@@ -1,18 +1,18 @@
 # Fish Shell command-line completions for Test Kitchen
 
 function __fish_kitchen_no_command -d 'Test if kitchen has yet to be given the main command'
-  set -l cmd (commandline -opc)
-  test (count $cmd) -eq 1
+    set -l cmd (commandline -opc)
+    test (count $cmd) -eq 1
 end
 
 function __fish_kitchen_using_command
-  set -l cmd (commandline -opc)
-  set -q cmd[2]; and test "$argv[1]" = $cmd[2]
+    set -l cmd (commandline -opc)
+    set -q cmd[2]; and test "$argv[1]" = $cmd[2]
 end
 
 function __fish_kitchen_using_command_and_no_subcommand
-  set -l cmd (commandline -opc)
-  test (count $cmd) -eq 2; and test "$argv[1]" = "$cmd[2]"
+    set -l cmd (commandline -opc)
+    test (count $cmd) -eq 2; and test "$argv[1]" = "$cmd[2]"
 end
 
 function __fish_kitchen_using_subcommand --argument-names cmd_main cmd_sub
@@ -46,9 +46,9 @@ complete -c kitchen -f -n '__fish_kitchen_using_command list' -a '(__fish_kitche
 # diagnose commands
 complete -c kitchen -f -n '__fish_kitchen_no_command' -a diagnose -d "Show computed diagnostic configuration"
 complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose'  -l "loader" -d "Include data loader diagnostics"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose'  -l "instances" -d "Include instances diagnostics"
-complete -c kitchen -f -n '__fish_kitchen_using_command diagnose'  -l "all" -d "Include all diagnostics"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l "loader" -d "Include data loader diagnostics"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l "instances" -d "Include instances diagnostics"
+complete -c kitchen -f -n '__fish_kitchen_using_command diagnose' -l "all" -d "Include all diagnostics"
 
 # diagnose help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a diagnose -d "Show computed diagnostic configuration"
@@ -122,7 +122,7 @@ complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "c" -l "concurr
 complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "p" -l "parallel" -d "[Future DEPRECATION, use --concurrency] Run a test against all matching instances concurrently. "
 complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
 complete -c kitchen -f -n '__fish_kitchen_using_command test' -s "d" -l "destroy" -d "Destroy strategy to use after testing (passing, always, never)."
-complete -c kitchen -f -n '__fish_kitchen_using_command test'  -l "auto_init" -d "Invoke init command if .kitchen.yml is missing"
+complete -c kitchen -f -n '__fish_kitchen_using_command test' -l "auto_init" -d "Invoke init command if .kitchen.yml is missing"
 
 # test help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a test -d "Test (destroy, create, converge, setup, verify and destroy) one or more instances"
@@ -143,7 +143,7 @@ complete -c kitchen -f -n '__fish_kitchen_using_command login' -a '(__fish_kitch
 # exec commands
 complete -c kitchen -f -n '__fish_kitchen_no_command' -a exec -d "Execute command on one or more instance"
 complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s "l" -l "log_level" -d "Set the log level (debug, info, warn, error, fatal)"
-complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s "c" -l "command" -d "execute via ssh"
+complete -c kitchen -f -n '__fish_kitchen_using_command exec' -s "c" -l command -d "execute via ssh"
 
 # exec help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a exec -d "Execute command on one or more instance"
@@ -173,7 +173,7 @@ complete -c kitchen -f -n '__fish_kitchen_using_command help' -a console -d "Kit
 complete -c kitchen -f -n '__fish_kitchen_no_command' -a init -d "Adds some configuration to your cookbook so Kitchen can rock"
 complete -c kitchen -f -n '__fish_kitchen_using_command init' -s "D" -l "driver" -d "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 complete -c kitchen -f -n '__fish_kitchen_using_command init' -s "P" -l "provisioner" -d "The default Kitchen Provisioner to use "
-complete -c kitchen -f -n '__fish_kitchen_using_command init'  -l "create_gemfile" -d "Whether or not to create a Gemfile if one does not exist. Default: false "
+complete -c kitchen -f -n '__fish_kitchen_using_command init' -l "create_gemfile" -d "Whether or not to create a Gemfile if one does not exist. Default: false "
 
 # init help
 complete -c kitchen -f -n '__fish_kitchen_using_command help' -a init -d "Adds some configuration to your cookbook so Kitchen can rock"
diff --git a/share/completions/kldload.fish b/share/completions/kldload.fish
index 2eccf2027..d97fde5eb 100644
--- a/share/completions/kldload.fish
+++ b/share/completions/kldload.fish
@@ -1,27 +1,27 @@
 # Completions for the FreeBSD `kldload` kernel module load utility
 function __fish_list_kldload_options
-	set -l klds (__fish_complete_suffix /boot/kernel/(commandline -ct) ".ko" | string replace -r '.*/(.+)\\.ko' '$1');
-	# Completing available klds is fast, but completing it with a call to __fish_whatis
-	# is decidedly not. With 846 modules (FreeBSD 11.1), fish --profile 'complete -C"kldload "' returns the following:
-	# 10671   11892698    > complete -C"kldload "
-	# A 12 second completion delay is obviously out of the question, so don't provide a description unless there are
-	# fewer than 50 results.
-	# Additionally, we can halve the time by not shelling out to `whatis` if we know the man file for the kernel module
-	# in question does not exist, since the paths are hardcoded.
-	set -l kld_count (count $klds)
-	if test $kld_count -le 50 -a $kld_count -gt 0
-		# print name and description
-		for kld in $klds
-			printf '%s\t%s\n' $kld (test -e /usr/share/man/man4/$kld.4.gz;
+    set -l klds (__fish_complete_suffix /boot/kernel/(commandline -ct) ".ko" | string replace -r '.*/(.+)\\.ko' '$1')
+    # Completing available klds is fast, but completing it with a call to __fish_whatis
+    # is decidedly not. With 846 modules (FreeBSD 11.1), fish --profile 'complete -C"kldload "' returns the following:
+    # 10671   11892698    > complete -C"kldload "
+    # A 12 second completion delay is obviously out of the question, so don't provide a description unless there are
+    # fewer than 50 results.
+    # Additionally, we can halve the time by not shelling out to `whatis` if we know the man file for the kernel module
+    # in question does not exist, since the paths are hardcoded.
+    set -l kld_count (count $klds)
+    if test $kld_count -le 50 -a $kld_count -gt 0
+        # print name and description
+        for kld in $klds
+            printf '%s\t%s\n' $kld (test -e /usr/share/man/man4/$kld.4.gz;
 				and __fish_whatis $kld; or echo "kernel module")
-		end
-	else if test $kld_count -gt 0
-		# print name only
-		printf '%s\n' $klds
-	else
-		# print name only (description won't exist since the kernel module isn't installed)
-		__fish_complete_suffix .ko
-	end
+        end
+    else if test $kld_count -gt 0
+        # print name only
+        printf '%s\n' $klds
+    else
+        # print name only (description won't exist since the kernel module isn't installed)
+        __fish_complete_suffix .ko
+    end
 end
 
 
diff --git a/share/completions/kldunload.fish b/share/completions/kldunload.fish
index d2db86e12..318ed5994 100644
--- a/share/completions/kldunload.fish
+++ b/share/completions/kldunload.fish
@@ -1,12 +1,12 @@
 function __fish_list_loaded_klds
-	set -l klds (kldstat | string match -r '\b\S+.ko$')
-	for kld in $klds
-		if set -l description (__fish_whatis (string replace '.ko' '' -- $kld) "kernel module")
-			printf '%s\t%s\n' $kld $description
-		else
-			printf '%s\n' $kld
-		end
-	end
+    set -l klds (kldstat | string match -r '\b\S+.ko$')
+    for kld in $klds
+        if set -l description (__fish_whatis (string replace '.ko' '' -- $kld) "kernel module")
+            printf '%s\t%s\n' $kld $description
+        else
+            printf '%s\n' $kld
+        end
+    end
 end
 
 complete -c kldunload -xa '(__fish_list_loaded_klds)'
diff --git a/share/completions/latexmk.fish b/share/completions/latexmk.fish
index 07818dfe3..35e3b9493 100644
--- a/share/completions/latexmk.fish
+++ b/share/completions/latexmk.fish
@@ -1,72 +1,72 @@
 complete -c latexmk -x -a "(__fish_complete_suffix (commandline -ct) .tex '(La)TeX file')"
-complete -c latexmk -o bibtex      -d 'use bibtex when needed (default)'
-complete -c latexmk -o bibtex-     -d 'never use bibtex'
+complete -c latexmk -o bibtex -d 'use bibtex when needed (default)'
+complete -c latexmk -o bibtex- -d 'never use bibtex'
 complete -c latexmk -o bibtex-cond -d 'use bibtex when needed, but only if the bib files exist'
-complete -c latexmk -o bm -x       -d 'Print message across the page when converting to postscript'
-complete -c latexmk -o bi -x       -d 'Set contrast or intensity of banner'
-complete -c latexmk -o bs -x       -d 'Set scale for banner'
-complete -c latexmk -o commands    -d 'list commands used by latexmk for processing files'
-complete -c latexmk -o c           -d 'clean up (remove) all nonessential files, except dvi, ps and pdf files'
-complete -c latexmk -o C -o CA     -d 'clean up (remove) all nonessential files'
-complete -c latexmk -o CF          -d 'Remove file of database of file information before doing other actions'
-complete -c latexmk -o cd          -d 'Change to directory of source file when processing it'
-complete -c latexmk -o cd-         -d 'Do NOT change to directory of source file when processing it'
-complete -c latexmk -o dependents  -o -deps -d 'Show list of dependent files after processing'
+complete -c latexmk -o bm -x -d 'Print message across the page when converting to postscript'
+complete -c latexmk -o bi -x -d 'Set contrast or intensity of banner'
+complete -c latexmk -o bs -x -d 'Set scale for banner'
+complete -c latexmk -o commands -d 'list commands used by latexmk for processing files'
+complete -c latexmk -o c -d 'clean up (remove) all nonessential files, except dvi, ps and pdf files'
+complete -c latexmk -o C -o CA -d 'clean up (remove) all nonessential files'
+complete -c latexmk -o CF -d 'Remove file of database of file information before doing other actions'
+complete -c latexmk -o cd -d 'Change to directory of source file when processing it'
+complete -c latexmk -o cd- -d 'Do NOT change to directory of source file when processing it'
+complete -c latexmk -o dependents -o -deps -d 'Show list of dependent files after processing'
 complete -c latexmk -o dependents- -o -deps- -d 'Do not show list of dependent files'
-complete -c latexmk -o deps-out= -r  -d 'Set name of output file for dependency list, and turn on showing of dependency list'
-complete -c latexmk -o dF -x         -d 'Filter to apply to dvi file'
-complete -c latexmk -o dvi           -d 'generate dvi'
-complete -c latexmk -o dvi-          -d 'turn off required dvi'
-complete -c latexmk -o e -x          -d 'Execute specified Perl code (as part of latexmk start-up code)'
-complete -c latexmk -o f    -d 'force continued processing past errors'
-complete -c latexmk -o f-   -d 'turn off forced continuing processing past errors'
-complete -c latexmk -o gg   -d 'Super go mode: clean out generated files before processing'
-complete -c latexmk -o g    -d 'process regardless of file timestamps'
-complete -c latexmk -o g-   -d 'Turn off -g'
-complete -c latexmk -o h -o help   -d 'print help'
+complete -c latexmk -o deps-out= -r -d 'Set name of output file for dependency list, and turn on showing of dependency list'
+complete -c latexmk -o dF -x -d 'Filter to apply to dvi file'
+complete -c latexmk -o dvi -d 'generate dvi'
+complete -c latexmk -o dvi- -d 'turn off required dvi'
+complete -c latexmk -o e -x -d 'Execute specified Perl code (as part of latexmk start-up code)'
+complete -c latexmk -o f -d 'force continued processing past errors'
+complete -c latexmk -o f- -d 'turn off forced continuing processing past errors'
+complete -c latexmk -o gg -d 'Super go mode: clean out generated files before processing'
+complete -c latexmk -o g -d 'process regardless of file timestamps'
+complete -c latexmk -o g- -d 'Turn off -g'
+complete -c latexmk -o h -o help -d 'print help'
 complete -c latexmk -o jobname= -x -d 'set basename of output file(s) to STRING'
-complete -c latexmk -o l    -d 'force landscape mode'
-complete -c latexmk -o l-   -d 'turn off -l'
-complete -c latexmk -o latex=       -d 'set program used for latex' -xa '(__fish_complete_command)'
-complete -c latexmk -o new-viewer   -d 'in -pvc mode, always start a new viewer'
-complete -c latexmk -o new-viewer-  -d 'in -pvc mode, start a new viewer only if needed'
-complete -c latexmk -o nobibtex     -d 'never use bibtex'
+complete -c latexmk -o l -d 'force landscape mode'
+complete -c latexmk -o l- -d 'turn off -l'
+complete -c latexmk -o latex= -d 'set program used for latex' -xa '(__fish_complete_command)'
+complete -c latexmk -o new-viewer -d 'in -pvc mode, always start a new viewer'
+complete -c latexmk -o new-viewer- -d 'in -pvc mode, start a new viewer only if needed'
+complete -c latexmk -o nobibtex -d 'never use bibtex'
 complete -c latexmk -o nodependents -d 'Do not show list of dependent files after processing'
-complete -c latexmk -o norc         -d 'omit automatic reading of system, user and project rc files'
+complete -c latexmk -o norc -d 'omit automatic reading of system, user and project rc files'
 complete -c latexmk -o output-directory= -o outdir= -d 'set name of directory for output files' -xa '(__fish_complete_directories)'
-complete -c latexmk -o pdf          -d 'generate pdf by pdflatex'
-complete -c latexmk -o pdfdvi       -d 'generate pdf by dvipdf'
-complete -c latexmk -o pdflatex=    -d 'set program used for pdflatex' -xa '(__fish_complete_command)'
-complete -c latexmk -o pdfps        -d 'generate pdf by ps2pdf'
-complete -c latexmk -o pdf-         -d 'turn off pdf'
-complete -c latexmk -o ps           -d 'generate postscript'
-complete -c latexmk -o ps-          -d 'turn off postscript'
-complete -c latexmk -o pF -x        -d 'Filter to apply to postscript file'
-complete -c latexmk -o p            -d 'print document after generating postscript'
-complete -c latexmk -o print=dvi    -d 'when file is to be printed, print the dvi file'
-complete -c latexmk -o print=ps     -d 'when file is to be printed, print the ps file (default)'
-complete -c latexmk -o print=pdf    -d 'when file is to be printed, print the pdf file'
-complete -c latexmk -o pv   -d 'preview document'
-complete -c latexmk -o pv-  -d 'turn off preview mode'
-complete -c latexmk -o pvc  -d 'preview document and continuously update'
+complete -c latexmk -o pdf -d 'generate pdf by pdflatex'
+complete -c latexmk -o pdfdvi -d 'generate pdf by dvipdf'
+complete -c latexmk -o pdflatex= -d 'set program used for pdflatex' -xa '(__fish_complete_command)'
+complete -c latexmk -o pdfps -d 'generate pdf by ps2pdf'
+complete -c latexmk -o pdf- -d 'turn off pdf'
+complete -c latexmk -o ps -d 'generate postscript'
+complete -c latexmk -o ps- -d 'turn off postscript'
+complete -c latexmk -o pF -x -d 'Filter to apply to postscript file'
+complete -c latexmk -o p -d 'print document after generating postscript'
+complete -c latexmk -o print=dvi -d 'when file is to be printed, print the dvi file'
+complete -c latexmk -o print=ps -d 'when file is to be printed, print the ps file (default)'
+complete -c latexmk -o print=pdf -d 'when file is to be printed, print the pdf file'
+complete -c latexmk -o pv -d 'preview document'
+complete -c latexmk -o pv- -d 'turn off preview mode'
+complete -c latexmk -o pvc -d 'preview document and continuously update'
 complete -c latexmk -o pvc- -d 'turn off -pvc'
 complete -c latexmk -o quiet -d 'silence progress messages from called programs'
-complete -c latexmk -o r -r  -d 'Read custom RC file'
-complete -c latexmk -o recorder  -d 'Use -recorder option for (pdf)latex'
+complete -c latexmk -o r -r -d 'Read custom RC file'
+complete -c latexmk -o recorder -d 'Use -recorder option for (pdf)latex'
 complete -c latexmk -o recorder- -d 'Do not use -recorder option for (pdf)latex'
-complete -c latexmk -o rules   -d 'Show list of rules after processing'
-complete -c latexmk -o rules-  -d 'Do not show list of rules after processing'
-complete -c latexmk -o silent  -d 'silence progress messages from called programs'
-complete -c latexmk -o time    -d 'show CPU time used'
-complete -c latexmk -o time-   -d 'don\'t show CPU time used'
-complete -c latexmk -o use-make  -d 'use the make program to try to make missing files'
+complete -c latexmk -o rules -d 'Show list of rules after processing'
+complete -c latexmk -o rules- -d 'Do not show list of rules after processing'
+complete -c latexmk -o silent -d 'silence progress messages from called programs'
+complete -c latexmk -o time -d 'show CPU time used'
+complete -c latexmk -o time- -d 'don\'t show CPU time used'
+complete -c latexmk -o use-make -d 'use the make program to try to make missing files'
 complete -c latexmk -o use-make- -d 'don\'t use the make program to try to make missing files'
-complete -c latexmk -o v       -d 'display program version'
+complete -c latexmk -o v -d 'display program version'
 complete -c latexmk -o verbose -d 'display usual progress messages from called programs'
-complete -c latexmk -o version      -d 'display program version'
+complete -c latexmk -o version -d 'display program version'
 complete -c latexmk -o view=default -d 'viewer is default (dvi, ps, pdf)'
-complete -c latexmk -o view=dvi     -d 'viewer is for dvi'
-complete -c latexmk -o view=none    -d 'no viewer is used'
-complete -c latexmk -o view=ps      -d 'viewer is for ps'
-complete -c latexmk -o view=pdf     -d 'viewer is for pdf'
+complete -c latexmk -o view=dvi -d 'viewer is for dvi'
+complete -c latexmk -o view=none -d 'no viewer is used'
+complete -c latexmk -o view=ps -d 'viewer is for ps'
+complete -c latexmk -o view=pdf -d 'viewer is for pdf'
 
diff --git a/share/completions/lein.fish b/share/completions/lein.fish
index 1006b0ebd..90174050d 100644
--- a/share/completions/lein.fish
+++ b/share/completions/lein.fish
@@ -1,9 +1,9 @@
 function __fish_lein_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 complete -f -c lein -n '__fish_lein_needs_command' -a check -d "Check syntax and warn on reflection."
diff --git a/share/completions/light.fish b/share/completions/light.fish
index 5b33abba8..7839335fa 100644
--- a/share/completions/light.fish
+++ b/share/completions/light.fish
@@ -2,7 +2,7 @@
 # See: https://github.com/haikarainen/light
 
 function __fish_print_light_controllers
-  command light -L
+    command light -L
 end
 
 complete -c light -s h -d 'Print help and exit'
diff --git a/share/completions/ln.fish b/share/completions/ln.fish
index fbc0bf61c..a8c79e1dc 100644
--- a/share/completions/ln.fish
+++ b/share/completions/ln.fish
@@ -1,16 +1,16 @@
-complete -c ln -s s -l symbolic            -d 'Make symbolic links instead of hard links'
-complete -c ln      -l backup              -d 'Make a backup of each existing destination file' -a "none off numbered t existing nil simple never"
-complete -c ln -s b                        -d 'Make a backup of each existing destination file'
-complete -c ln -s d -l directory           -d 'Allow superuser to attempt to hard link directories'
-complete -c ln -s f -l force               -d 'Remove existing destination files'
-complete -c ln -s i -l interactive         -d 'Prompt whether to remove destinations'
-complete -c ln -s L -l logical             -d 'Dereference TARGETs that are symbolic links'
-complete -c ln -s n -l no-dereference      -d 'Treat symlink to directory as if it were a file'
-complete -c ln -s P -l physical            -d 'Make hard links directly to symbolic links'
-complete -c ln -s S -l suffix              -d 'Override the usual ~ backup suffix'
-complete -c ln -s t -l target-directory    -d 'Specify the DIRECTORY in which to create the links' -a '(__fish_complete_directories)'
+complete -c ln -s s -l symbolic -d 'Make symbolic links instead of hard links'
+complete -c ln -l backup -d 'Make a backup of each existing destination file' -a "none off numbered t existing nil simple never"
+complete -c ln -s b -d 'Make a backup of each existing destination file'
+complete -c ln -s d -l directory -d 'Allow superuser to attempt to hard link directories'
+complete -c ln -s f -l force -d 'Remove existing destination files'
+complete -c ln -s i -l interactive -d 'Prompt whether to remove destinations'
+complete -c ln -s L -l logical -d 'Dereference TARGETs that are symbolic links'
+complete -c ln -s n -l no-dereference -d 'Treat symlink to directory as if it were a file'
+complete -c ln -s P -l physical -d 'Make hard links directly to symbolic links'
+complete -c ln -s S -l suffix -d 'Override the usual ~ backup suffix'
+complete -c ln -s t -l target-directory -d 'Specify the DIRECTORY in which to create the links' -a '(__fish_complete_directories)'
 complete -c ln -s T -l no-target-directory -d 'Treat LINK_NAME as a normal file'
-complete -c ln -s v -l verbose             -d 'Print name of each linked file'
+complete -c ln -s v -l verbose -d 'Print name of each linked file'
 
-complete -c ln -f   -l help                -d 'Display help and exit'
-complete -c ln -f   -l version             -d 'Output version information and exit'
+complete -c ln -f -l help -d 'Display help and exit'
+complete -c ln -f -l version -d 'Output version information and exit'
diff --git a/share/completions/localectl.fish b/share/completions/localectl.fish
index 16e99b69a..715ff86f7 100644
--- a/share/completions/localectl.fish
+++ b/share/completions/localectl.fish
@@ -3,22 +3,22 @@ set -l commands status set-locale list-locales set-keymap list-keymaps set-x11-k
 
 complete -c localectl -f
 for cmd in $commands
-	complete -c localectl -n "not __fish_seen_subcommand_from $commands" -a $cmd
+    complete -c localectl -n "not __fish_seen_subcommand_from $commands" -a $cmd
 end
 set -l localevars LANG LC_MESSAGES LC_{CTYPE,NUMERIC,TIME,COLLATE,MONETARY,MESSAGES,PAPER,NAME,ADDRESS,TELEPHONE,MEASUREMENT,IDENTIFICATION,ALL}
 set -l locales $localevars=(localectl list-locales)
 
 function __fish_localectl_layout
-	set -l cmd (commandline -poc)
-	set -e cmd[1]
-	set -e cmd[1]
-	for l in (localectl list-x11-keymap-layouts)
-		if contains -- $l $cmd
-			echo $l
-			return 0
-		end
-	end
-	return 1
+    set -l cmd (commandline -poc)
+    set -e cmd[1]
+    set -e cmd[1]
+    for l in (localectl list-x11-keymap-layouts)
+        if contains -- $l $cmd
+            echo $l
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c localectl -n "__fish_seen_subcommand_from set-locale" -a "$locales"
diff --git a/share/completions/locate.fish b/share/completions/locate.fish
index 04aea4dd1..2a1c821ac 100644
--- a/share/completions/locate.fish
+++ b/share/completions/locate.fish
@@ -1,17 +1,17 @@
 
-complete -c locate -s A -l 'all'          -d 'Match all non-option arguments'
-complete -c locate -s b -l 'basename'     -d 'Match against the base name of the file'
-complete -c locate -s c -l 'count'        -d 'Print only the number of matches found'
-complete -c locate -s d -l 'database' -r  -d 'Use different DATABASE file[s]'
-complete -c locate -s e -l 'existing'     -d 'Match only existing files'
-complete -c locate -s L -l 'follow'       -d 'Consider broken symbolic links to be non-existing files'
-complete -c locate -s P -l 'nofollow'     -d 'Treat broken symbolic links as if they were existing'
-complete -c locate -s H -l 'nofollow'     -d 'Treat broken symbolic links as if they were existing'
-complete -c locate -s i -l 'ignore-case'  -d 'Ignore case distinctions'
-complete -c locate -s l -l 'limit' -r     -d 'Limit  the number of matches'
-complete -c locate -s 0 -l 'null'         -d 'Use ASCII NUL as a separator'
-complete -c locate -s S -l 'statistics'   -d 'Print statistics about databases and exit'
-complete -c locate -s w -l 'wholename'    -d 'Match against the whole name of the file'
-complete -c locate -s r -l 'regex'        -d 'The pattern is a regular expression'
-complete -c locate -s h -l 'help'         -d 'Print a summary of the options and exit'
-complete -c locate -s V -l 'version'      -d 'Print the version number and exit'
+complete -c locate -s A -l 'all' -d 'Match all non-option arguments'
+complete -c locate -s b -l 'basename' -d 'Match against the base name of the file'
+complete -c locate -s c -l 'count' -d 'Print only the number of matches found'
+complete -c locate -s d -l 'database' -r -d 'Use different DATABASE file[s]'
+complete -c locate -s e -l 'existing' -d 'Match only existing files'
+complete -c locate -s L -l 'follow' -d 'Consider broken symbolic links to be non-existing files'
+complete -c locate -s P -l 'nofollow' -d 'Treat broken symbolic links as if they were existing'
+complete -c locate -s H -l 'nofollow' -d 'Treat broken symbolic links as if they were existing'
+complete -c locate -s i -l 'ignore-case' -d 'Ignore case distinctions'
+complete -c locate -s l -l 'limit' -r -d 'Limit  the number of matches'
+complete -c locate -s 0 -l 'null' -d 'Use ASCII NUL as a separator'
+complete -c locate -s S -l 'statistics' -d 'Print statistics about databases and exit'
+complete -c locate -s w -l 'wholename' -d 'Match against the whole name of the file'
+complete -c locate -s r -l 'regex' -d 'The pattern is a regular expression'
+complete -c locate -s h -l 'help' -d 'Print a summary of the options and exit'
+complete -c locate -s V -l 'version' -d 'Print the version number and exit'
diff --git a/share/completions/lpadmin.fish b/share/completions/lpadmin.fish
index acfc57eeb..171d9c50e 100644
--- a/share/completions/lpadmin.fish
+++ b/share/completions/lpadmin.fish
@@ -9,12 +9,12 @@ complete -c lpadmin -s D -d 'Provides a textual description of the destination'
 complete -c lpadmin -s E -d 'Enables the destination and accepts jobs'
 complete -c lpadmin -s L -d 'Provides a textual location of the destination' -x
 complete -c lpadmin -s P -d 'Specifies a PostScript Printer Description file to use with the printer' -xa "(__fish_complete_suffix .ppd; __fish_complete_suffix .ppd.gz)"
-complete -c lpadmin -s o -xa cupsIPPSupplies=true  -d 'Specifies whether IPP supply level values should be reported'
+complete -c lpadmin -s o -xa cupsIPPSupplies=true -d 'Specifies whether IPP supply level values should be reported'
 complete -c lpadmin -s o -xa cupsIPPSupplies=false -d 'Specifies whether IPP supply level values should be reported'
 complete -c lpadmin -s o -xa cupsSNMPSupplies=true -d 'Specifies whether SNMP supply level (RFC 3805) values should be reported'
 complete -c lpadmin -s o -xa cupsSNMPSupplies=false -d 'Specifies whether SNMP supply level (RFC 3805) values should be reported'
 complete -c lpadmin -s o -xa job-k-limit= -d 'Sets the kilobyte limit for per-user quotas. The value is an integer number of kilobytes (1024)'
-complete -c lpadmin -s o -xa job-page-limit=  -d 'Sets the page limit for per-user quotas (int) '
+complete -c lpadmin -s o -xa job-page-limit= -d 'Sets the page limit for per-user quotas (int) '
 complete -c lpadmin -s o -xa job-quota-period= -d 'Sets the accounting period for per-user quotas (sec)'
 complete -c lpadmin -s o -xa job-sheets-default= -d 'Sets the default banner page(s) to use for print jobs'
 complete -c lpadmin -s o -d 'Sets a  PPD option for the printer' -xa '(__fish_complete_lpr_option)'
diff --git a/share/completions/ls.fish b/share/completions/ls.fish
index 786536f6b..a1dfe711d 100644
--- a/share/completions/ls.fish
+++ b/share/completions/ls.fish
@@ -6,7 +6,7 @@
 set -l uname (uname -s)
 complete -c ls -s C -d "Force multi-column output"
 test "$uname" != SunOS
-    and complete -c ls -s S -d "Sort by size"
+and complete -c ls -s S -d "Sort by size"
 complete -c ls -s m -d "Comma-separated format, fills across screen"
 complete -c ls -s x -d "Multi-column output, horizontally listed"
 complete -c ls -s 1 -d "List one entry per line"
@@ -107,7 +107,7 @@ else
 
     complete -c ls -s i -d "Show inode numbers for files"
     test "$uname" != SunOS
-        and complete -c ls -s k -d "for -s: Display sizes in kB, not blocks" # GNU sets block size with -k
+    and complete -c ls -s k -d "for -s: Display sizes in kB, not blocks" # GNU sets block size with -k
     complete -c ls -s q -d "Replace non-graphic characters with '?'"
     complete -c ls -s r -d "Reverse sort order"
     complete -c ls -s s -d "Show file sizes"
@@ -116,8 +116,8 @@ else
     complete -c ls -s l -d "Long listing format"
     complete -c ls -s n -d "Long format, numerical UIDs and GIDs"
     contains "$uname" FreeBSD NetBSD OpenBSD DragonFly
-        and complete -c ls -o o -d "Long format, show file flags" # annoying BSD
-        or complete -c ls -s o -d "Long format, omit group names" # annoying POSIX
+    and complete -c ls -o o -d "Long format, show file flags" # annoying BSD
+    or complete -c ls -s o -d "Long format, omit group names" # annoying POSIX
 
     complete -c ls -s A -d "Show hidden except . and .."
     complete -c ls -s a -d "Show hidden entries"
@@ -129,7 +129,7 @@ else
 
     complete -c ls -s L -d "Follow all symlinks Cancels -P option"
     test "$uname" != NetBSD
-        and complete -c ls -s H -d "Follow symlink given on commandline" # not present on netbsd
+    and complete -c ls -s H -d "Follow symlink given on commandline" # not present on netbsd
 
     complete -c ls -s R -d "Recursively list subdirectories"
     complete -c ls -s d -d "List directories, not their content"
diff --git a/share/completions/lsblk.fish b/share/completions/lsblk.fish
index c3dce3efd..359d2d328 100644
--- a/share/completions/lsblk.fish
+++ b/share/completions/lsblk.fish
@@ -1,16 +1,16 @@
-complete -c lsblk -s a -l all         -d "print all devices"
-complete -c lsblk -s b -l bytes       -d "print SIZE in bytes rather than in human readable format"
-complete -c lsblk -s d -l nodeps      -d "don't print slaves or holders"
-complete -c lsblk -s D -l discard     -d "print discard capabilities"
-complete -c lsblk -s e -l exclude     -d "exclude devices by major number (default: RAM disks)"
-complete -c lsblk -s f -l fs          -d "output info about filesystems"
-complete -c lsblk -s h -l help        -d "usage information (this)"
-complete -c lsblk -s i -l ascii       -d "use ascii characters only"
-complete -c lsblk -s m -l perms       -d "output info about permissions"
-complete -c lsblk -s n -l noheadings  -d "don't print headings"
-complete -c lsblk -s o -l output      -d "output columns" -xa '( __fish_complete_list , __fish_print_lsblk_columns )'
-complete -c lsblk -s P -l pairs       -d "use key='value' output format"
-complete -c lsblk -s r -l raw         -d "use raw output format"
-complete -c lsblk -s t -l topology    -d "output info about topology"
-complete -c lsblk -s l -l list        -d "use list format ouput"
+complete -c lsblk -s a -l all -d "print all devices"
+complete -c lsblk -s b -l bytes -d "print SIZE in bytes rather than in human readable format"
+complete -c lsblk -s d -l nodeps -d "don't print slaves or holders"
+complete -c lsblk -s D -l discard -d "print discard capabilities"
+complete -c lsblk -s e -l exclude -d "exclude devices by major number (default: RAM disks)"
+complete -c lsblk -s f -l fs -d "output info about filesystems"
+complete -c lsblk -s h -l help -d "usage information (this)"
+complete -c lsblk -s i -l ascii -d "use ascii characters only"
+complete -c lsblk -s m -l perms -d "output info about permissions"
+complete -c lsblk -s n -l noheadings -d "don't print headings"
+complete -c lsblk -s o -l output -d "output columns" -xa '( __fish_complete_list , __fish_print_lsblk_columns )'
+complete -c lsblk -s P -l pairs -d "use key='value' output format"
+complete -c lsblk -s r -l raw -d "use raw output format"
+complete -c lsblk -s t -l topology -d "output info about topology"
+complete -c lsblk -s l -l list -d "use list format ouput"
 
diff --git a/share/completions/lunchy.fish b/share/completions/lunchy.fish
index ea1538b6f..954cf9bf8 100644
--- a/share/completions/lunchy.fish
+++ b/share/completions/lunchy.fish
@@ -1,40 +1,40 @@
 function __fish_lunchy_needs_command
-  set cmd (commandline -opc)
+    set cmd (commandline -opc)
 
-  if test (count $cmd) -eq 1
-    return 0
-  end
+    if test (count $cmd) -eq 1
+        return 0
+    end
 
-  return 1
+    return 1
 end
 
 function __fish_lunchy_using_command
-  set cmd (commandline -opc)
-  set cmd_count (count $cmd)
+    set cmd (commandline -opc)
+    set cmd_count (count $cmd)
 
-  if test $cmd_count -lt 2
-    return 1
-  end
-
-  for arg in $argv
-    if test $arg = $cmd[2]
-      return 0
+    if test $cmd_count -lt 2
+        return 1
     end
-  end
 
-  return 1
+    for arg in $argv
+        if test $arg = $cmd[2]
+            return 0
+        end
+    end
+
+    return 1
 end
 
 complete -f -c lunchy -s v -l verbose -d 'Show command executions'
 
 # Commands
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a install   -d 'Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a install -d 'Installs [file] to ~/Library/LaunchAgents or /Library/LaunchAgents'
 complete -f -c lunchy -n '__fish_lunchy_needs_command' -a 'ls list' -d 'Show the list of installed agents'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a start     -d 'Start the first matching agent'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a stop      -d 'Stop the first matching agent'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a restart   -d 'Stop and start the first matching agent'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a status    -d 'Show the PID and label for all agents'
-complete -f -c lunchy -n '__fish_lunchy_needs_command' -a edit      -d 'Opens the launchctl daemon file in the default editor'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a start -d 'Start the first matching agent'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a stop -d 'Stop the first matching agent'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a restart -d 'Stop and start the first matching agent'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a status -d 'Show the PID and label for all agents'
+complete -f -c lunchy -n '__fish_lunchy_needs_command' -a edit -d 'Opens the launchctl daemon file in the default editor'
 
 # Commands with service completion
 complete -f -c lunchy -n '__fish_lunchy_using_command ls list start stop restart status edit' -a '(lunchy ls)' -d 'Service'
diff --git a/share/completions/lxpanel.fish b/share/completions/lxpanel.fish
index 07b8bad20..fb97dada5 100644
--- a/share/completions/lxpanel.fish
+++ b/share/completions/lxpanel.fish
@@ -1,5 +1,5 @@
-complete -c lxpanel -s h -l help         -d 'print this help and exit'
-complete -c lxpanel -s v -l version      -d 'print version and exit'
-complete -c lxpanel -s p -l profile      -d 'use specified profile' -xa '(find ~/.config/lxpanel/ -maxdepth 1 -mindepth 1  -type d -printf "%f\n")'
-complete -c lxpanel -l log -r            -d 'set log level 0-5. 0 - none 5 - chatty'
+complete -c lxpanel -s h -l help -d 'print this help and exit'
+complete -c lxpanel -s v -l version -d 'print version and exit'
+complete -c lxpanel -s p -l profile -d 'use specified profile' -xa '(find ~/.config/lxpanel/ -maxdepth 1 -mindepth 1  -type d -printf "%f\n")'
+complete -c lxpanel -l log -r -d 'set log level 0-5. 0 - none 5 - chatty'
 
diff --git a/share/completions/machinectl.fish b/share/completions/machinectl.fish
index 277988c7b..847477b17 100644
--- a/share/completions/machinectl.fish
+++ b/share/completions/machinectl.fish
@@ -1,36 +1,36 @@
 complete -f -e -c machinectl
 
 set -l commands list status show start login enable disable poweroff reboot \
-terminate kill bind copy-{to,from} list-images image-status show-image clone rename read-only remove set-limit pull-{tar,raw,dkr} \
-{import,export}-{raw,tar} {list,cancel}-transfers shell
+    terminate kill bind copy-{to,from} list-images image-status show-image clone rename read-only remove set-limit pull-{tar,raw,dkr} \
+    {import,export}-{raw,tar} {list,cancel}-transfers shell
 
 function __fish_systemd_has_machine_image
-	set -l images (__fish_systemd_machine_images)
-	for i in $images ".host"
-		# Include ".host" here because it _is_ a valid machine
-		if contains -- $i (commandline -opc)
-			echo $i
-			return 0
-		end
-	end
-	return 1
+    set -l images (__fish_systemd_machine_images)
+    for i in $images ".host"
+        # Include ".host" here because it _is_ a valid machine
+        if contains -- $i (commandline -opc)
+            echo $i
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_systemd_has_machine
-	set -l cmd
-	if not count $argv >/dev/null
-		set cmd (commandline -opc)
-	else
-		set cmd $argv
-	end
-	set -l machines (__fish_systemd_machines)
-	for m in $machines
-		if contains -- $m $cmd
-			echo $m
-			return 0
-		end
-	end
-	return 1
+    set -l cmd
+    if not count $argv >/dev/null
+        set cmd (commandline -opc)
+    else
+        set cmd $argv
+    end
+    set -l machines (__fish_systemd_machines)
+    for m in $machines
+        if contains -- $m $cmd
+            echo $m
+            return 0
+        end
+    end
+    return 1
 end
 
 # General options
@@ -51,7 +51,7 @@ complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "sta
 complete -f -c machinectl -n "__fish_seen_subcommand_from status" -s l -l full -d "Do not ellipsize process tree entries"
 complete -x -c machinectl -n "__fish_seen_subcommand_from status" -s n -l lines -d "How many journal lines to show"
 complete -x -c machinectl -n "__fish_seen_subcommand_from status" -s o -l output -d "Formatting of journal output" -a \
-'short short-iso short-precise short-monotonic verbose export json json-pretty json-sse cat'
+    'short short-iso short-precise short-monotonic verbose export json json-pretty json-sse cat'
 
 complete -f -c machinectl -n "not __fish_seen_subcommand_from $commands" -a "show" -d "Show properties of machines"
 complete -x -c machinectl -n "__fish_seen_subcommand_from show" -s p -l property -d "Limit to certain properties"
diff --git a/share/completions/magento.fish b/share/completions/magento.fish
index 5b65881f4..ee853377c 100644
--- a/share/completions/magento.fish
+++ b/share/completions/magento.fish
@@ -1,182 +1,182 @@
 function __fish_print_magento_url_protocols -d "Shows all available URL protocols"
-  echo http://
-  echo https://
+    echo http://
+    echo https://
 end
 
 function __fish_print_magento_mysql_engines
-  echo MyISAM\t"MyISAM storage engine"
-  echo InnoDB\t"Supports transactions, row-level locking, and foreign keys"
-  echo BLACKHOLE\t"/dev/null storage engine (anything you write to it disappears)"
-  echo MEMORY\t"Hash based, stored in memory, useful for temporary tables"
-  echo CSV\t"CSV storage engine"
-  echo ARCHIVE\t"Archive storage engine"
+    echo MyISAM\t"MyISAM storage engine"
+    echo InnoDB\t"Supports transactions, row-level locking, and foreign keys"
+    echo BLACKHOLE\t"/dev/null storage engine (anything you write to it disappears)"
+    echo MEMORY\t"Hash based, stored in memory, useful for temporary tables"
+    echo CSV\t"CSV storage engine"
+    echo ARCHIVE\t"Archive storage engine"
 end
 
 ###
 
 function __fish_print_magento_modules -d "Lists all Magento modules"
-  set -l modules (magento module:status)
+    set -l modules (magento module:status)
 
-  for i in $test
-    if test -n "$i" -a "$i" != "None"
-      echo $i 
+    for i in $test
+        if test -n "$i" -a "$i" != "None"
+            echo $i
+        end
     end
-  end
 end
 
 function __fish_magento_print_indexer_modes -d "Lists all indexer modes"
-  echo realtime\t"Index in realtime"
-  echo schedule\t"Index via cron jobs"
+    echo realtime\t"Index in realtime"
+    echo schedule\t"Index via cron jobs"
 end
 
 function __fish_print_magento_i18n_packing_modes -d "Shows all available packing modes"
-  echo replace\t"replace language pack by new one"
-  echo merge\t"merge language packages"
+    echo replace\t"replace language pack by new one"
+    echo merge\t"merge language packages"
 end
 
 function __fish_print_magento_available_ides -d "Shows all IDEs supported by magento"
-  echo phpstorm\t"JetBrains PhpStorm"
+    echo phpstorm\t"JetBrains PhpStorm"
 end
 
 function __fish_print_magento_available_tests -d "Shows all available magento tests"
-  echo all\t"all tests"
-  echo unit\t"unit tests only"
-  echo integration\t"integration tests only"
-  echo integration-all\t"all integration tests"
-  echo static\t"static file tests only"
-  echo static-all\t"all static file tests"
-  echo integrity\t"integrity tests only"
-  echo legacy\t"legacy tests only"
-  echo default\t"all tests"  
+    echo all\t"all tests"
+    echo unit\t"unit tests only"
+    echo integration\t"integration tests only"
+    echo integration-all\t"all integration tests"
+    echo static\t"static file tests only"
+    echo static-all\t"all static file tests"
+    echo integrity\t"integrity tests only"
+    echo legacy\t"legacy tests only"
+    echo default\t"all tests"
 end
 
 function __fish_print_magento_theme_areas -d "Shows all available magento theme areas"
-	echo frontend\t"Frontend"
-	echo adminhtml\t"Backend"
+    echo frontend\t"Frontend"
+    echo adminhtml\t"Backend"
 end
 
 function __fish_print_magento_languages -d "Shows all existing magento languages"
-	echo af_ZA\t"Afrikaans (South Africa)"
-	echo sq_AL\t"Albanian (Albania)"
-	echo ar_DZ\t"Arabic (Algeria)"
-	echo ar_EG\t"Arabic (Egypt)"
-	echo ar_KW\t"Arabic (Kuwait)"
-	echo ar_MA\t"Arabic (Morocco)"
-	echo ar_SA\t"Arabic (Saudi Arabia)"
-	echo az_Latn_AZ\t"Azerbaijani (Azerbaijan)"
-	echo eu_ES\t"Basque (Spain)"
-	echo be_BY\t"Belarusian (Belarus)"
-	echo bn_BD\t"Bengali (Bangladesh)"
-	echo bs_Latn_BA\t"Bosnian (Bosnia and Herzegovina)"
-	echo bg_BG\t"Bulgarian (Bulgaria)"
-	echo ca_ES\t"Catalan (Spain)"
-	echo zh_Hans_CN\t"Chinese (China)"
-	echo zh_Hant_HK\t"Chinese (Hong Kong SAR China)"
-	echo zh_Hant_TW\t"Chinese (Taiwan)"
-	echo hr_HR\t"Croatian (Croatia)"
-	echo cs_CZ\t"Czech (Czech Republic)"
-	echo da_DK\t"Danish (Denmark)"
-	echo nl_BE\t"Dutch (Belgium)"
-	echo nl_NL\t"Dutch (Netherlands)"
-	echo en_AU\t"English (Australia)"
-	echo en_CA\t"English (Canada)"
-	echo en_IE\t"English (Ireland)"
-	echo en_NZ\t"English (New Zealand)"
-	echo en_GB\t"English (United Kingdom)"
-	echo en_US\t"English (United States)"
-	echo et_EE\t"Estonian (Estonia)"
-	echo fil_PH\t"Filipino (Philippines)"
-	echo fi_FI\t"Finnish (Finland)"
-	echo fr_BE\t"French (Belgium)"
-	echo fr_CA\t"French (Canada)"
-	echo fr_FR\t"French (France)"
-	echo gl_ES\t"Galician (Spain)"
-	echo ka_GE\t"Georgian (Georgia)"
-	echo de_AT\t"German (Austria)"
-	echo de_DE\t"German (Germany)"
-	echo de_CH\t"German (Switzerland)"
-	echo el_GR\t"Greek (Greece)"
-	echo gu_IN\t"Gujarati (India)"
-	echo he_IL\t"Hebrew (Israel)"
-	echo hi_IN\t"Hindi (India)"
-	echo hu_HU\t"Hungarian (Hungary)"
-	echo is_IS\t"Icelandic (Iceland)"
-	echo id_ID\t"Indonesian (Indonesia)"
-	echo it_IT\t"Italian (Italy)"
-	echo it_CH\t"Italian (Switzerland)"
-	echo ja_JP\t"Japanese (Japan)"
-	echo km_KH\t"Khmer (Cambodia)"
-	echo ko_KR\t"Korean (South Korea)"
-	echo lo_LA\t"Lao (Laos)"
-	echo lv_LV\t"Latvian (Latvia)"
-	echo lt_LT\t"Lithuanian (Lithuania)"
-	echo mk_MK\t"Macedonian (Macedonia)"
-	echo ms_Latn_MY\t"Malay (Malaysia)"
-	echo mn_Cyrl_MN\t"Mongolian (Mongolia)"
-	echo nb_NO\t"Norwegian Bokmål (Norway)"
-	echo nn_NO\t"Norwegian Nynorsk (Norway)"
-	echo fa_IR\t"Persian (Iran)"
-	echo pl_PL\t"Polish (Poland)"
-	echo pt_BR\t"Portuguese (Brazil)"
-	echo pt_PT\t"Portuguese (Portugal)"
-	echo ro_RO\t"Romanian (Romania)"
-	echo ru_RU\t"Russian (Russia)"
-	echo sr_Cyrl_RS\t"Serbian (Serbia)"
-	echo sk_SK\t"Slovak (Slovakia)"
-	echo sl_SI\t"Slovenian (Slovenia)"
-	echo es_AR\t"Spanish (Argentina)"
-	echo es_CL\t"Spanish (Chile)"
-	echo es_CO\t"Spanish (Colombia)"
-	echo es_CR\t"Spanish (Costa Rica)"
-	echo es_MX\t"Spanish (Mexico)"
-	echo es_PA\t"Spanish (Panama)"
-	echo es_PE\t"Spanish (Peru)"
-	echo es_ES\t"Spanish (Spain)"
-	echo es_VE\t"Spanish (Venezuela)"
-	echo sw_KE\t"Swahili (Kenya)"
-	echo sv_SE\t"Swedish (Sweden)"
-	echo th_TH\t"Thai (Thailand)"
-	echo tr_TR\t"Turkish (Turkey)"
-	echo uk_UA\t"Ukrainian (Ukraine)"
-	echo vi_VN\t"Vietnamese (Vietnam)"
-	echo cy_GB\t"Welsh (United Kingdom)"
+    echo af_ZA\t"Afrikaans (South Africa)"
+    echo sq_AL\t"Albanian (Albania)"
+    echo ar_DZ\t"Arabic (Algeria)"
+    echo ar_EG\t"Arabic (Egypt)"
+    echo ar_KW\t"Arabic (Kuwait)"
+    echo ar_MA\t"Arabic (Morocco)"
+    echo ar_SA\t"Arabic (Saudi Arabia)"
+    echo az_Latn_AZ\t"Azerbaijani (Azerbaijan)"
+    echo eu_ES\t"Basque (Spain)"
+    echo be_BY\t"Belarusian (Belarus)"
+    echo bn_BD\t"Bengali (Bangladesh)"
+    echo bs_Latn_BA\t"Bosnian (Bosnia and Herzegovina)"
+    echo bg_BG\t"Bulgarian (Bulgaria)"
+    echo ca_ES\t"Catalan (Spain)"
+    echo zh_Hans_CN\t"Chinese (China)"
+    echo zh_Hant_HK\t"Chinese (Hong Kong SAR China)"
+    echo zh_Hant_TW\t"Chinese (Taiwan)"
+    echo hr_HR\t"Croatian (Croatia)"
+    echo cs_CZ\t"Czech (Czech Republic)"
+    echo da_DK\t"Danish (Denmark)"
+    echo nl_BE\t"Dutch (Belgium)"
+    echo nl_NL\t"Dutch (Netherlands)"
+    echo en_AU\t"English (Australia)"
+    echo en_CA\t"English (Canada)"
+    echo en_IE\t"English (Ireland)"
+    echo en_NZ\t"English (New Zealand)"
+    echo en_GB\t"English (United Kingdom)"
+    echo en_US\t"English (United States)"
+    echo et_EE\t"Estonian (Estonia)"
+    echo fil_PH\t"Filipino (Philippines)"
+    echo fi_FI\t"Finnish (Finland)"
+    echo fr_BE\t"French (Belgium)"
+    echo fr_CA\t"French (Canada)"
+    echo fr_FR\t"French (France)"
+    echo gl_ES\t"Galician (Spain)"
+    echo ka_GE\t"Georgian (Georgia)"
+    echo de_AT\t"German (Austria)"
+    echo de_DE\t"German (Germany)"
+    echo de_CH\t"German (Switzerland)"
+    echo el_GR\t"Greek (Greece)"
+    echo gu_IN\t"Gujarati (India)"
+    echo he_IL\t"Hebrew (Israel)"
+    echo hi_IN\t"Hindi (India)"
+    echo hu_HU\t"Hungarian (Hungary)"
+    echo is_IS\t"Icelandic (Iceland)"
+    echo id_ID\t"Indonesian (Indonesia)"
+    echo it_IT\t"Italian (Italy)"
+    echo it_CH\t"Italian (Switzerland)"
+    echo ja_JP\t"Japanese (Japan)"
+    echo km_KH\t"Khmer (Cambodia)"
+    echo ko_KR\t"Korean (South Korea)"
+    echo lo_LA\t"Lao (Laos)"
+    echo lv_LV\t"Latvian (Latvia)"
+    echo lt_LT\t"Lithuanian (Lithuania)"
+    echo mk_MK\t"Macedonian (Macedonia)"
+    echo ms_Latn_MY\t"Malay (Malaysia)"
+    echo mn_Cyrl_MN\t"Mongolian (Mongolia)"
+    echo nb_NO\t"Norwegian Bokmål (Norway)"
+    echo nn_NO\t"Norwegian Nynorsk (Norway)"
+    echo fa_IR\t"Persian (Iran)"
+    echo pl_PL\t"Polish (Poland)"
+    echo pt_BR\t"Portuguese (Brazil)"
+    echo pt_PT\t"Portuguese (Portugal)"
+    echo ro_RO\t"Romanian (Romania)"
+    echo ru_RU\t"Russian (Russia)"
+    echo sr_Cyrl_RS\t"Serbian (Serbia)"
+    echo sk_SK\t"Slovak (Slovakia)"
+    echo sl_SI\t"Slovenian (Slovenia)"
+    echo es_AR\t"Spanish (Argentina)"
+    echo es_CL\t"Spanish (Chile)"
+    echo es_CO\t"Spanish (Colombia)"
+    echo es_CR\t"Spanish (Costa Rica)"
+    echo es_MX\t"Spanish (Mexico)"
+    echo es_PA\t"Spanish (Panama)"
+    echo es_PE\t"Spanish (Peru)"
+    echo es_ES\t"Spanish (Spain)"
+    echo es_VE\t"Spanish (Venezuela)"
+    echo sw_KE\t"Swahili (Kenya)"
+    echo sv_SE\t"Swedish (Sweden)"
+    echo th_TH\t"Thai (Thailand)"
+    echo tr_TR\t"Turkish (Turkey)"
+    echo uk_UA\t"Ukrainian (Ukraine)"
+    echo vi_VN\t"Vietnamese (Vietnam)"
+    echo cy_GB\t"Welsh (United Kingdom)"
 end
 
 
 function __fish_print_magento_source_theme_file_types -d "Shows all available source theme file types"
-  echo less\t"Currently only LESS is supported"
+    echo less\t"Currently only LESS is supported"
 end
 
 function __fish_print_magento_deploy_modes -d "Shows all available deploy modes"
-  echo developer\t"Development mode"
-  echo production\t"Production mode"
+    echo developer\t"Development mode"
+    echo production\t"Production mode"
 end
 
 function __fish_print_magento_cache_types -d "Shows all available cache types"
-  echo config\t"Configuration"
-  echo layout\t"Layout"
-  echo block_html\t"Block HTML output"
-  echo collections\t"Collections data"
-  echo db_ddl\t"Database schema"
-  echo eav\t"Entity attribute value (EAV)"
-  echo full_page\t"Page cache"
-  echo reflection\t"Reflection"
-  echo translate\t"Translations"
-  echo config_integration\t"Integration configuration"
-  echo config_integration_api\t"Integration API configuration"
-  echo config_webservice\t"Web services configuration"
+    echo config\t"Configuration"
+    echo layout\t"Layout"
+    echo block_html\t"Block HTML output"
+    echo collections\t"Collections data"
+    echo db_ddl\t"Database schema"
+    echo eav\t"Entity attribute value (EAV)"
+    echo full_page\t"Page cache"
+    echo reflection\t"Reflection"
+    echo translate\t"Translations"
+    echo config_integration\t"Integration configuration"
+    echo config_integration_api\t"Integration API configuration"
+    echo config_webservice\t"Web services configuration"
 end
 
 function __fish_print_magento_verbosity_levels -d "Shows all available verbosity levels"
-  echo 1\t"normal output"
-  echo 2\t"more verbose output"
-  echo 3\t"debug"
+    echo 1\t"normal output"
+    echo 2\t"more verbose output"
+    echo 3\t"debug"
 end
 
 function __fish_print_magento_list_formats -d "Shows all available output formats"
-  echo txt\t"Print as plain text"
-  echo json\t"Print as JSON"
-  echo xml\t"Print as XML"
+    echo txt\t"Print as plain text"
+    echo json\t"Print as JSON"
+    echo xml\t"Print as XML"
 end
 
 function __fish_print_magento_commands_list -d "Lists magento commands"
@@ -189,7 +189,7 @@ end
 #########################################################
 
 function __fish_magento_not_in_command -d "Checks that prompt is not inside of magento command"
-    set -l cmd (commandline -opc) 
+    set -l cmd (commandline -opc)
     for i in $cmd
         if contains -- $i (__fish_print_magento_commands_list)
             return 1
@@ -227,395 +227,395 @@ end
 #########################################################
 
 function __fish_magento_parameter_missing -d "Checks if a parameter has been given already"
-  if __fish_contains_opt $argv
-    return 1
-  end
+    if __fish_contains_opt $argv
+        return 1
+    end
 
-  return 0
+    return 0
 end
 
 
 ##################
 # Global options #
 ##################
-complete -x -c magento -s h -l help -d "Show help for a command";
-complete -x -c magento -s q -l quiet -d "Do not output any message";
-complete -x -c magento -s v -l verbose -a "(__fish_print_magento_verbosity_levels)" -d "Increase verbosity: 1 for normal, 2 for verbose and 3 for debug";
-complete -x -c magento -o -vv;
-complete -x -c magento -o vvv;
-complete -x -c magento -s V -l version -d "Show version";
-complete -x -c magento -l ansi -d "Force colored output";
-complete -x -c magento -l no-ansi -d "Disable colored output";
-complete -x -c magento -s n -l no-interaction -d "Don't ask any interactive question";
+complete -x -c magento -s h -l help -d "Show help for a command"
+complete -x -c magento -s q -l quiet -d "Do not output any message"
+complete -x -c magento -s v -l verbose -a "(__fish_print_magento_verbosity_levels)" -d "Increase verbosity: 1 for normal, 2 for verbose and 3 for debug"
+complete -x -c magento -o -vv
+complete -x -c magento -o vvv
+complete -x -c magento -s V -l version -d "Show version"
+complete -x -c magento -l ansi -d "Force colored output"
+complete -x -c magento -l no-ansi -d "Disable colored output"
+complete -x -c magento -s n -l no-interaction -d "Don't ask any interactive question"
 
 ################
 # Sub-Commands #
 ################
-__fish_magento_register_command help -a "(__fish_print_magento_commands_list)" -d "Show help for a command";
-__fish_magento_register_command list -d "List commands";
+__fish_magento_register_command help -a "(__fish_print_magento_commands_list)" -d "Show help for a command"
+__fish_magento_register_command list -d "List commands"
 
-__fish_magento_register_command admin:user:create -x -d "Create admin account";
-__fish_magento_register_command admin:user:unlock -x -d "Unlock admin account";
+__fish_magento_register_command admin:user:create -x -d "Create admin account"
+__fish_magento_register_command admin:user:unlock -x -d "Unlock admin account"
 
-__fish_magento_register_command app:config:dump -d "Create application dump";
+__fish_magento_register_command app:config:dump -d "Create application dump"
 
-__fish_magento_register_command cache:clean -d "Clean cache types";
-__fish_magento_register_command cache:disable -d "Disable cache types";
-__fish_magento_register_command cache:enable -d "Enable cache types";
-__fish_magento_register_command cache:flush -d "Flush cache storage used by cache types";
-__fish_magento_register_command cache:status -d "Check cache status";
+__fish_magento_register_command cache:clean -d "Clean cache types"
+__fish_magento_register_command cache:disable -d "Disable cache types"
+__fish_magento_register_command cache:enable -d "Enable cache types"
+__fish_magento_register_command cache:flush -d "Flush cache storage used by cache types"
+__fish_magento_register_command cache:status -d "Check cache status"
 
-__fish_magento_register_command catalog:images:resize -d "Create resized product images";
-__fish_magento_register_command catalog:product:attributes:cleanup -d "Remove unused product attributes";
+__fish_magento_register_command catalog:images:resize -d "Create resized product images"
+__fish_magento_register_command catalog:product:attributes:cleanup -d "Remove unused product attributes"
 
-__fish_magento_register_command cron:run -d "Run jobs by schedule";
+__fish_magento_register_command cron:run -d "Run jobs by schedule"
 
-__fish_magento_register_command customer:hash:upgrade -d "Upgrade customer's hashes according to latest algorithm";
+__fish_magento_register_command customer:hash:upgrade -d "Upgrade customer's hashes according to latest algorithm"
 
-__fish_magento_register_command deploy:mode:set -d "Set application mode";
-__fish_magento_register_command deploy:mode:show -d "Show current application mode";
+__fish_magento_register_command deploy:mode:set -d "Set application mode"
+__fish_magento_register_command deploy:mode:show -d "Show current application mode"
 
-__fish_magento_register_command dev:source-theme:deploy -d "Collect and publish source files for theme";
-__fish_magento_register_command dev:tests:run -d "Run tests";
-__fish_magento_register_command dev:urn-catalog:generate -d "Generate catalog of URNs to *.xsd mappings for IDEs to highlight XML";
-__fish_magento_register_command dev:xml:convert -d "Convert XML file using XSL stylesheets";
+__fish_magento_register_command dev:source-theme:deploy -d "Collect and publish source files for theme"
+__fish_magento_register_command dev:tests:run -d "Run tests"
+__fish_magento_register_command dev:urn-catalog:generate -d "Generate catalog of URNs to *.xsd mappings for IDEs to highlight XML"
+__fish_magento_register_command dev:xml:convert -d "Convert XML file using XSL stylesheets"
 
-__fish_magento_register_command i18n:collect-phrases -d "Discover phrases in the codebase";
-__fish_magento_register_command i18n:pack -d "Save language package";
-__fish_magento_register_command i18n:uninstall -d "Uninstall language packages";
+__fish_magento_register_command i18n:collect-phrases -d "Discover phrases in the codebase"
+__fish_magento_register_command i18n:pack -d "Save language package"
+__fish_magento_register_command i18n:uninstall -d "Uninstall language packages"
 
-__fish_magento_register_command indexer:info -d "Show allowed indexers";
-__fish_magento_register_command indexer:reindex -d "Reindex data";
-__fish_magento_register_command indexer:reset -d "Reset indexer status to invalid";
-__fish_magento_register_command indexer:set-mode -d "Set index mode type";
-__fish_magento_register_command indexer:show-mode -d "Show index mode";
-__fish_magento_register_command indexer:status -d "Show status of indexer";
+__fish_magento_register_command indexer:info -d "Show allowed indexers"
+__fish_magento_register_command indexer:reindex -d "Reindex data"
+__fish_magento_register_command indexer:reset -d "Reset indexer status to invalid"
+__fish_magento_register_command indexer:set-mode -d "Set index mode type"
+__fish_magento_register_command indexer:show-mode -d "Show index mode"
+__fish_magento_register_command indexer:status -d "Show status of indexer"
 
-__fish_magento_register_command info:adminuri -d "Show Magento Admin URI";
-__fish_magento_register_command info:backups:list -d "Show available backup files";
-__fish_magento_register_command info:currency:list -d "Show available currencies";
-__fish_magento_register_command info:dependencies:show-framework -d "Show dependencies on Magento framework";
-__fish_magento_register_command info:dependencies:show-modules -d "Show dependencies between modules";
-__fish_magento_register_command info:dependencies:show-modules-circular -d "Show circular dependencies between modules";
-__fish_magento_register_command info:language:list -d "Show available languages";
-__fish_magento_register_command info:timezone:list -d "Show available timezones";
+__fish_magento_register_command info:adminuri -d "Show Magento Admin URI"
+__fish_magento_register_command info:backups:list -d "Show available backup files"
+__fish_magento_register_command info:currency:list -d "Show available currencies"
+__fish_magento_register_command info:dependencies:show-framework -d "Show dependencies on Magento framework"
+__fish_magento_register_command info:dependencies:show-modules -d "Show dependencies between modules"
+__fish_magento_register_command info:dependencies:show-modules-circular -d "Show circular dependencies between modules"
+__fish_magento_register_command info:language:list -d "Show available languages"
+__fish_magento_register_command info:timezone:list -d "Show available timezones"
 
-__fish_magento_register_command maintenance:allow-ips -d "Set maintenance mode exempt IPs";
-__fish_magento_register_command maintenance:disable -d "Disable maintenance mode";
-__fish_magento_register_command maintenance:enable -d "Enable maintenance mode";
-__fish_magento_register_command maintenance:status -d "Show maintenance mode status";
+__fish_magento_register_command maintenance:allow-ips -d "Set maintenance mode exempt IPs"
+__fish_magento_register_command maintenance:disable -d "Disable maintenance mode"
+__fish_magento_register_command maintenance:enable -d "Enable maintenance mode"
+__fish_magento_register_command maintenance:status -d "Show maintenance mode status"
 
-__fish_magento_register_command module:disable -d "Disable specified modules";
-__fish_magento_register_command module:enable -d "Enable specified modules";
-__fish_magento_register_command module:status -d "Show status of modules";
-__fish_magento_register_command module:uninstall -d "Uninstall modules installed by composer";
+__fish_magento_register_command module:disable -d "Disable specified modules"
+__fish_magento_register_command module:enable -d "Enable specified modules"
+__fish_magento_register_command module:status -d "Show status of modules"
+__fish_magento_register_command module:uninstall -d "Uninstall modules installed by composer"
 
-__fish_magento_register_command sampledata:deploy -d "Deploy sample data modules";
-__fish_magento_register_command sampledata:remove -d "Remove sample data packages";
-__fish_magento_register_command sampledata:reset -d "Reset sample data modules for re-installation";
+__fish_magento_register_command sampledata:deploy -d "Deploy sample data modules"
+__fish_magento_register_command sampledata:remove -d "Remove sample data packages"
+__fish_magento_register_command sampledata:reset -d "Reset sample data modules for re-installation"
 
-__fish_magento_register_command setup:backup -d "Take backup of application code base, media and database";
-__fish_magento_register_command setup:config:set -d "Create or modifies the deployment configuration";
-__fish_magento_register_command setup:cron:run -d "Run cron job scheduled for setup application";
-__fish_magento_register_command setup:db-data:upgrade -d "Install and upgrades data in the DB";
-__fish_magento_register_command setup:db-schema:upgrade -d "Install and upgrade the DB schema";
-__fish_magento_register_command setup:db:status -d "Check if DB schema or data requires upgrade";
-__fish_magento_register_command setup:di:compile -d "Generate DI configuration and all missing classes that can be auto-generated";
-__fish_magento_register_command setup:install -d "Install Magento application";
-__fish_magento_register_command setup:performance:generate-fixtures -d "Generate fixtures";
-__fish_magento_register_command setup:rollback -d "Roll back Magento Application codebase, media and database";
-__fish_magento_register_command setup:static-content:deploy -d "Deploy static view files";
-__fish_magento_register_command setup:store-config:set -d "Install store configuration";
-__fish_magento_register_command setup:uninstall -d "Uninstall Magento application";
-__fish_magento_register_command setup:upgrade -d "Upgrade Magento application, DB data, and schema";
+__fish_magento_register_command setup:backup -d "Take backup of application code base, media and database"
+__fish_magento_register_command setup:config:set -d "Create or modifies the deployment configuration"
+__fish_magento_register_command setup:cron:run -d "Run cron job scheduled for setup application"
+__fish_magento_register_command setup:db-data:upgrade -d "Install and upgrades data in the DB"
+__fish_magento_register_command setup:db-schema:upgrade -d "Install and upgrade the DB schema"
+__fish_magento_register_command setup:db:status -d "Check if DB schema or data requires upgrade"
+__fish_magento_register_command setup:di:compile -d "Generate DI configuration and all missing classes that can be auto-generated"
+__fish_magento_register_command setup:install -d "Install Magento application"
+__fish_magento_register_command setup:performance:generate-fixtures -d "Generate fixtures"
+__fish_magento_register_command setup:rollback -d "Roll back Magento Application codebase, media and database"
+__fish_magento_register_command setup:static-content:deploy -d "Deploy static view files"
+__fish_magento_register_command setup:store-config:set -d "Install store configuration"
+__fish_magento_register_command setup:uninstall -d "Uninstall Magento application"
+__fish_magento_register_command setup:upgrade -d "Upgrade Magento application, DB data, and schema"
 
-__fish_magento_register_command theme:uninstall -d "Uninstall theme";
+__fish_magento_register_command theme:uninstall -d "Uninstall theme"
 
 #
 # help
 #
-__fish_magento_register_command_option help -x -a "(__fish_print_magento_commands_list)" -d "Show help for a command";
+__fish_magento_register_command_option help -x -a "(__fish_print_magento_commands_list)" -d "Show help for a command"
 
 #
 # list
 #
-__fish_magento_register_command_option list -f -l xml -d "Output as XML";
-__fish_magento_register_command_option list -f -l raw -d "Output as plaintext";
-__fish_magento_register_command_option list -f -l format -a "(__fish_print_magento_list_formats)" -d "Output other formats (default: txt)";
+__fish_magento_register_command_option list -f -l xml -d "Output as XML"
+__fish_magento_register_command_option list -f -l raw -d "Output as plaintext"
+__fish_magento_register_command_option list -f -l format -a "(__fish_print_magento_list_formats)" -d "Output other formats (default: txt)"
 
 #
 # admin:user:create
 #
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user";
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password";
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email";
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name";
-__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-user -d "(Required) Admin user";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-password -d "(Required) Admin password";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-email -d "(Required) Admin email";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-firstname -d "(Required) Admin first name";
-__fish_magento_register_command_option admin:user:create -f -r -l admin-lastname -d "(Required) Admin last name";
-__fish_magento_register_command_option admin:user:create -f -l magento-init-params -d "Add to any command to customize Magento initialization parameters";
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name"
+__fish_magento_register_command_option admin:user:create -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-user -d "(Required) Admin user"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-password -d "(Required) Admin password"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-email -d "(Required) Admin email"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-firstname -d "(Required) Admin first name"
+__fish_magento_register_command_option admin:user:create -f -r -l admin-lastname -d "(Required) Admin last name"
+__fish_magento_register_command_option admin:user:create -f -l magento-init-params -d "Add to any command to customize Magento initialization parameters"
 
 #
 # admin:user:unlock
 #
-__fish_magento_register_command_option admin:user:unlock -f -d "Admin user to unlock";
+__fish_magento_register_command_option admin:user:unlock -f -d "Admin user to unlock"
 
 #
 # cache:clean
 #
-__fish_magento_register_command_option cache:clean -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all";
-__fish_magento_register_command_option cache:clean -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cache:clean -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all"
+__fish_magento_register_command_option cache:clean -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # cache:enable
 #
-__fish_magento_register_command_option cache:enable -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all";
-__fish_magento_register_command_option cache:enable -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cache:enable -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all"
+__fish_magento_register_command_option cache:enable -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # cache:disable
 #
-__fish_magento_register_command_option cache:disable -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all";
-__fish_magento_register_command_option cache:disable -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cache:disable -f -a "(__fish_print_magento_cache_types)" -d "Space-separated list of cache types or omit for all"
+__fish_magento_register_command_option cache:disable -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # cache:status
 #
-__fish_magento_register_command_option cache:status -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cache:status -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # cron:run
 #
-__fish_magento_register_command_option cron:run -f -l group -d "Run jobs only from specified group";
-__fish_magento_register_command_option cron:run -f -l bootstrap -d "Add or override parameters of the bootstrap";
+__fish_magento_register_command_option cron:run -f -l group -d "Run jobs only from specified group"
+__fish_magento_register_command_option cron:run -f -l bootstrap -d "Add or override parameters of the bootstrap"
 
 #
 # deploy:mode:set
 #
-__fish_magento_register_command_option deploy:mode:set -f -a "(__fish_print_magento_deploy_modes)" -d 'Application mode to set. Available are "developer" or "production"';
-__fish_magento_register_command_option deploy:mode:set -f -s s -l skip-compilation -d "Skip clearing and regeneration of static content (generated code, preprocessed CSS, and assets in pub/static/)";
+__fish_magento_register_command_option deploy:mode:set -f -a "(__fish_print_magento_deploy_modes)" -d 'Application mode to set. Available are "developer" or "production"'
+__fish_magento_register_command_option deploy:mode:set -f -s s -l skip-compilation -d "Skip clearing and regeneration of static content (generated code, preprocessed CSS, and assets in pub/static/)"
 
 #
 # dev:source-theme:deploy
 #
-__fish_magento_register_command_option dev:source-theme:deploy -d 'Files to pre-process (file should be specified without extension) (default: "css/styles-m","css/styles-l")';
-__fish_magento_register_command_option dev:source-theme:deploy -f -l type -a "(__fish_print_magento_source_theme_file_types)" -d 'Type of source files (default: "less")';
-__fish_magento_register_command_option dev:source-theme:deploy -f -l locale -a "(__fish_print_magento_languages)" -d 'Locale (default: "en_US")';
-__fish_magento_register_command_option dev:source-theme:deploy -f -l area -a "(__fish_print_magento_theme_areas)" -d 'Area (default: "frontend")';
-__fish_magento_register_command_option dev:source-theme:deploy -l theme -d 'Theme [Vendor/theme] (default: "Magento/luma")';
+__fish_magento_register_command_option dev:source-theme:deploy -d 'Files to pre-process (file should be specified without extension) (default: "css/styles-m","css/styles-l")'
+__fish_magento_register_command_option dev:source-theme:deploy -f -l type -a "(__fish_print_magento_source_theme_file_types)" -d 'Type of source files (default: "less")'
+__fish_magento_register_command_option dev:source-theme:deploy -f -l locale -a "(__fish_print_magento_languages)" -d 'Locale (default: "en_US")'
+__fish_magento_register_command_option dev:source-theme:deploy -f -l area -a "(__fish_print_magento_theme_areas)" -d 'Area (default: "frontend")'
+__fish_magento_register_command_option dev:source-theme:deploy -l theme -d 'Theme [Vendor/theme] (default: "Magento/luma")'
 
 #
 # dev:tests:run
 #
-__fish_magento_register_command_option dev:tests:run -f -a "(__fish_print_magento_available_tests)" -d 'Type of test to run (default: "default")';
+__fish_magento_register_command_option dev:tests:run -f -a "(__fish_print_magento_available_tests)" -d 'Type of test to run (default: "default")'
 
 #
 # dev:urn-catalog:generate
 #
-__fish_magento_register_command_option dev:urn-catalog:generate -f -l ide -a "(__fish_print_magento_available_ides)" -d 'Catalog generation format. Supported: [phpstorm] (default: "phpstorm")';
+__fish_magento_register_command_option dev:urn-catalog:generate -f -l ide -a "(__fish_print_magento_available_ides)" -d 'Catalog generation format. Supported: [phpstorm] (default: "phpstorm")'
 
 #
 # dev:xml:convert
 #
-__fish_magento_register_command_option dev:xml:convert -s o -l overwrite -d 'Overwrite XML file';
+__fish_magento_register_command_option dev:xml:convert -s o -l overwrite -d 'Overwrite XML file'
 
 #
 # i18n:collect-phrases
 #
-__fish_magento_register_command_option i18n:collect-phrases -s o -l output -d 'Path (including filename) to an output file. With no file specified, defaults to stdout';
-__fish_magento_register_command_option i18n:collect-phrases -f -s m -l magento -d 'Use --magento to parse current Magento codebase. Omit parameter if a directory is specified';
+__fish_magento_register_command_option i18n:collect-phrases -s o -l output -d 'Path (including filename) to an output file. With no file specified, defaults to stdout'
+__fish_magento_register_command_option i18n:collect-phrases -f -s m -l magento -d 'Use --magento to parse current Magento codebase. Omit parameter if a directory is specified'
 
 #
 # i18n:pack
 #
-__fish_magento_register_command_option i18n:pack -f -s m -l mode -a "(__fish_print_magento_i18n_packing_modes)" -d 'Save mode for dictionary (default: "replace")';
-__fish_magento_register_command_option i18n:pack -s d -l allow-duplicates -d 'Use --allow-duplicates to allow saving duplicates of translate. Otherwise omit parameter';
+__fish_magento_register_command_option i18n:pack -f -s m -l mode -a "(__fish_print_magento_i18n_packing_modes)" -d 'Save mode for dictionary (default: "replace")'
+__fish_magento_register_command_option i18n:pack -s d -l allow-duplicates -d 'Use --allow-duplicates to allow saving duplicates of translate. Otherwise omit parameter'
 
 #
 # i18n:uninstall
 #
-__fish_magento_register_command_option i18n:uninstall -f -s b -l backup-code -d 'Take code and configuration files backup (excluding temporary files)';
-__fish_magento_register_command_option i18n:uninstall -f -a "(__fish_print_magento_languages)" -d 'Language package name';
+__fish_magento_register_command_option i18n:uninstall -f -s b -l backup-code -d 'Take code and configuration files backup (excluding temporary files)'
+__fish_magento_register_command_option i18n:uninstall -f -a "(__fish_print_magento_languages)" -d 'Language package name'
 
 # 
 # info:dependencies:show-framework
 #
-__fish_magento_register_command_option info:dependencies:show-framework -f -s o -l output -d 'Report filename (default: "framework-dependencies.csv")';
+__fish_magento_register_command_option info:dependencies:show-framework -f -s o -l output -d 'Report filename (default: "framework-dependencies.csv")'
 
 #
 # info:dependencies:show-modules
 #
-__fish_magento_register_command_option info:dependencies:show-modules -f -s o -l output -d 'Report filename (default: "modules-dependencies.csv")';
+__fish_magento_register_command_option info:dependencies:show-modules -f -s o -l output -d 'Report filename (default: "modules-dependencies.csv")'
 
 #
 # info:dependencies:show-modules-circular
 #
-__fish_magento_register_command_option info:dependencies:show-modules-circular -f -s o -l output -d 'Report filename (default: "modules-circular-dependencies.csv")';
+__fish_magento_register_command_option info:dependencies:show-modules-circular -f -s o -l output -d 'Report filename (default: "modules-circular-dependencies.csv")'
 
 #
 # maintenance:allow-ips
 #
-__fish_magento_register_command_option maintenance:allow-ips -l none -d 'Clear allowed IP addresses';
+__fish_magento_register_command_option maintenance:allow-ips -l none -d 'Clear allowed IP addresses'
 
 #
 # maintenance:disable
 #
-__fish_magento_register_command_option maintenance:disable -l ip -d "Allowed IP addresses (use 'none' to clear list)";
+__fish_magento_register_command_option maintenance:disable -l ip -d "Allowed IP addresses (use 'none' to clear list)"
 
 #
 # maintenance:enable  
 # 
-__fish_magento_register_command_option maintenance:enable -l ip -d "Allowed IP addresses (use 'none' to clear list)";
+__fish_magento_register_command_option maintenance:enable -l ip -d "Allowed IP addresses (use 'none' to clear list)"
 
 #
 # module:disable
 #
-__fish_magento_register_command_option module:disable -f -a "(__fish_print_magento_modules)" -d "Module name";
-__fish_magento_register_command_option module:disable -s f -l force -d "Bypass dependencies check";
-__fish_magento_register_command_option module:disable -l all -d "Disable all modules";
-__fish_magento_register_command_option module:disable -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files";
+__fish_magento_register_command_option module:disable -f -a "(__fish_print_magento_modules)" -d "Module name"
+__fish_magento_register_command_option module:disable -s f -l force -d "Bypass dependencies check"
+__fish_magento_register_command_option module:disable -l all -d "Disable all modules"
+__fish_magento_register_command_option module:disable -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files"
 
 #
 # module:enable
 # 
-__fish_magento_register_command_option module:enable -f -a "(__fish_print_magento_modules)" -d "Module name";
-__fish_magento_register_command_option module:enable -f -s f -l force -d "Bypass dependencies check";
-__fish_magento_register_command_option module:enable -f -l all -d "Enable all modules";
-__fish_magento_register_command_option module:enable -f -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files";
+__fish_magento_register_command_option module:enable -f -a "(__fish_print_magento_modules)" -d "Module name"
+__fish_magento_register_command_option module:enable -f -s f -l force -d "Bypass dependencies check"
+__fish_magento_register_command_option module:enable -f -l all -d "Enable all modules"
+__fish_magento_register_command_option module:enable -f -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files"
 
 #
 # module:uninstall
 #
-__fish_magento_register_command_option module:uninstall -f -a "(__fish_print_magento_modules)" -d "Module name";
-__fish_magento_register_command_option module:uninstall -f -s r -l remove-data -d "Remove data installed by module(s)";
-__fish_magento_register_command_option module:uninstall -f -l backup-code -d "Take code and configuration files backup (excluding temporary files)";
-__fish_magento_register_command_option module:uninstall -f -l backup-media -d "Take media backup";
-__fish_magento_register_command_option module:uninstall -f -l backup-db -d "Take complete database backup";
-__fish_magento_register_command_option module:uninstall -f -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files";
+__fish_magento_register_command_option module:uninstall -f -a "(__fish_print_magento_modules)" -d "Module name"
+__fish_magento_register_command_option module:uninstall -f -s r -l remove-data -d "Remove data installed by module(s)"
+__fish_magento_register_command_option module:uninstall -f -l backup-code -d "Take code and configuration files backup (excluding temporary files)"
+__fish_magento_register_command_option module:uninstall -f -l backup-media -d "Take media backup"
+__fish_magento_register_command_option module:uninstall -f -l backup-db -d "Take complete database backup"
+__fish_magento_register_command_option module:uninstall -f -s c -l clear-static-content -d "Clear generated static view files. Necessary if module(s) have static view files"
 
 #
 # setup:backup
 #
-__fish_magento_register_command_option setup:backup -f -l code -d "Take code and configuration files backup (excluding temporary files)";
-__fish_magento_register_command_option setup:backup -f -l media -d "Take media backup";
-__fish_magento_register_command_option setup:backup -f -l db -d "Take complete database backup";
+__fish_magento_register_command_option setup:backup -f -l code -d "Take code and configuration files backup (excluding temporary files)"
+__fish_magento_register_command_option setup:backup -f -l media -d "Take media backup"
+__fish_magento_register_command_option setup:backup -f -l db -d "Take complete database backup"
 
 #
 # setup:config:set
 #
-__fish_magento_register_command_option setup:config:set -f -l backend-frontname -d "Backend frontname (will be autogenerated if missing)";
-__fish_magento_register_command_option setup:config:set -f -l key -d "Encryption key";
-__fish_magento_register_command_option setup:config:set -f -l session-save -d "Session save handler";
+__fish_magento_register_command_option setup:config:set -f -l backend-frontname -d "Backend frontname (will be autogenerated if missing)"
+__fish_magento_register_command_option setup:config:set -f -l key -d "Encryption key"
+__fish_magento_register_command_option setup:config:set -f -l session-save -d "Session save handler"
 __fish_magento_register_command_option setup:config:set -f -l definition-format -d "Type of definitions used by Object Manager"
-__fish_magento_register_command_option setup:config:set -f -l db-host -d "Database server host";
-__fish_magento_register_command_option setup:config:set -f -l db-name -d "Database name";
-__fish_magento_register_command_option setup:config:set -f -l db-user -d "Database server username";
-__fish_magento_register_command_option setup:config:set -f -l db-engine -d "Database server engine" -a "(__fish_print_magento_mysql_engines)";
-__fish_magento_register_command_option setup:config:set -f -l db-password -d "Database server password";
-__fish_magento_register_command_option setup:config:set -f -l db-prefix -d "Database table prefix";
-__fish_magento_register_command_option setup:config:set -f -l db-model -d "Database type";
-__fish_magento_register_command_option setup:config:set -f -l db-init-statements -d "Database initial set of commands";
-__fish_magento_register_command_option setup:config:set -f -l skip-db-validation -s s -d "If specified, then db connection validation will be skipped";
-__fish_magento_register_command_option setup:config:set -f -l http-cache-hosts -d "HTTP cache hosts";
+__fish_magento_register_command_option setup:config:set -f -l db-host -d "Database server host"
+__fish_magento_register_command_option setup:config:set -f -l db-name -d "Database name"
+__fish_magento_register_command_option setup:config:set -f -l db-user -d "Database server username"
+__fish_magento_register_command_option setup:config:set -f -l db-engine -d "Database server engine" -a "(__fish_print_magento_mysql_engines)"
+__fish_magento_register_command_option setup:config:set -f -l db-password -d "Database server password"
+__fish_magento_register_command_option setup:config:set -f -l db-prefix -d "Database table prefix"
+__fish_magento_register_command_option setup:config:set -f -l db-model -d "Database type"
+__fish_magento_register_command_option setup:config:set -f -l db-init-statements -d "Database initial set of commands"
+__fish_magento_register_command_option setup:config:set -f -l skip-db-validation -s s -d "If specified, then db connection validation will be skipped"
+__fish_magento_register_command_option setup:config:set -f -l http-cache-hosts -d "HTTP cache hosts"
 
 #
 # setup:install
 #
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user";
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password";
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email";
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name";
-__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name";
-__fish_magento_register_command_option setup:install -f -l backend-frontname -d "Backend frontname (will be autogenerated if missing)";
-__fish_magento_register_command_option setup:install -f -l key -d "Encryption key";
-__fish_magento_register_command_option setup:install -f -l session-save -d "Session save handler";
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-user" -f -a "--admin-user" -d "(Required) Admin user"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-password" -f -a "--admin-password" -d "(Required) Admin password"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-email" -f -a "--admin-email" -d "(Required) Admin email"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-firstname" -f -a "--admin-firstname" -d "(Required) Admin first name"
+__fish_magento_register_command_option setup:install -n "__fish_magento_parameter_missing admin-lastname" -f -a "--admin-lastname" -d "(Required) Admin last name"
+__fish_magento_register_command_option setup:install -f -l backend-frontname -d "Backend frontname (will be autogenerated if missing)"
+__fish_magento_register_command_option setup:install -f -l key -d "Encryption key"
+__fish_magento_register_command_option setup:install -f -l session-save -d "Session save handler"
 __fish_magento_register_command_option setup:install -f -l definition-format -d "Type of definitions used by Object Manager"
-__fish_magento_register_command_option setup:install -f -l db-host -d "Database server host";
-__fish_magento_register_command_option setup:install -f -l db-name -d "Database name";
-__fish_magento_register_command_option setup:install -f -l db-user -d "Database server username";
-__fish_magento_register_command_option setup:install -f -l db-engine -d "Database server engine" -a "(__fish_print_magento_mysql_engines)";
-__fish_magento_register_command_option setup:install -f -l db-password -d "Database server password";
-__fish_magento_register_command_option setup:install -f -l db-prefix -d "Database table prefix";
-__fish_magento_register_command_option setup:install -f -l db-model -d "Database type";
-__fish_magento_register_command_option setup:install -f -l db-init-statements -d "Database initial set of commands";
-__fish_magento_register_command_option setup:install -f -l skip-db-validation -s s -d "Skip database connection validation";
-__fish_magento_register_command_option setup:install -f -l http-cache-hosts -d "HTTP cache hosts";
-__fish_magento_register_command_option setup:install -f -l base-url -a "(__fish_print_magento_url_protocols)" -d "URL the store is supposed to be available at";
-__fish_magento_register_command_option setup:install -f -l language -a "(__fish_print_magento_languages)" -d "Default language code";
-__fish_magento_register_command_option setup:install -f -l timezone -d "Default time zone code";
-__fish_magento_register_command_option setup:install -f -l currency -d "Default currency code";
-__fish_magento_register_command_option setup:install -f -l use-rewrites -d "Use rewrites";
-__fish_magento_register_command_option setup:install -f -l use-secure -d "Use secure URLs. Enable only if SSL is available";
-__fish_magento_register_command_option setup:install -f -l base-url-secure -a "https://" -d "Base URL for SSL connection";
-__fish_magento_register_command_option setup:install -f -l use-secure-admin -d "Run admin interface with SSL";
-__fish_magento_register_command_option setup:install -f -l admin-use-security-key -d 'Use security key in admin urls/forms';
-__fish_magento_register_command_option setup:install -f -r -l admin-user -d "(Required) Admin user";
-__fish_magento_register_command_option setup:install -f -r -l admin-password -d "(Required) Admin password";
-__fish_magento_register_command_option setup:install -f -r -l admin-email -d "(Required) Admin email";
-__fish_magento_register_command_option setup:install -f -r -l admin-firstname -d "(Required) Admin first name";
-__fish_magento_register_command_option setup:install -f -r -l admin-lastname -d "(Required) Admin last name";
-__fish_magento_register_command_option setup:install -f -l cleanup-database -d "Cleanup database before installation";
-__fish_magento_register_command_option setup:install -f -l sales-order-increment-prefix -d "Sales order number prefix";
-__fish_magento_register_command_option setup:install -f -l use-sample-data -d "Use sample data";
+__fish_magento_register_command_option setup:install -f -l db-host -d "Database server host"
+__fish_magento_register_command_option setup:install -f -l db-name -d "Database name"
+__fish_magento_register_command_option setup:install -f -l db-user -d "Database server username"
+__fish_magento_register_command_option setup:install -f -l db-engine -d "Database server engine" -a "(__fish_print_magento_mysql_engines)"
+__fish_magento_register_command_option setup:install -f -l db-password -d "Database server password"
+__fish_magento_register_command_option setup:install -f -l db-prefix -d "Database table prefix"
+__fish_magento_register_command_option setup:install -f -l db-model -d "Database type"
+__fish_magento_register_command_option setup:install -f -l db-init-statements -d "Database initial set of commands"
+__fish_magento_register_command_option setup:install -f -l skip-db-validation -s s -d "Skip database connection validation"
+__fish_magento_register_command_option setup:install -f -l http-cache-hosts -d "HTTP cache hosts"
+__fish_magento_register_command_option setup:install -f -l base-url -a "(__fish_print_magento_url_protocols)" -d "URL the store is supposed to be available at"
+__fish_magento_register_command_option setup:install -f -l language -a "(__fish_print_magento_languages)" -d "Default language code"
+__fish_magento_register_command_option setup:install -f -l timezone -d "Default time zone code"
+__fish_magento_register_command_option setup:install -f -l currency -d "Default currency code"
+__fish_magento_register_command_option setup:install -f -l use-rewrites -d "Use rewrites"
+__fish_magento_register_command_option setup:install -f -l use-secure -d "Use secure URLs. Enable only if SSL is available"
+__fish_magento_register_command_option setup:install -f -l base-url-secure -a "https://" -d "Base URL for SSL connection"
+__fish_magento_register_command_option setup:install -f -l use-secure-admin -d "Run admin interface with SSL"
+__fish_magento_register_command_option setup:install -f -l admin-use-security-key -d 'Use security key in admin urls/forms'
+__fish_magento_register_command_option setup:install -f -r -l admin-user -d "(Required) Admin user"
+__fish_magento_register_command_option setup:install -f -r -l admin-password -d "(Required) Admin password"
+__fish_magento_register_command_option setup:install -f -r -l admin-email -d "(Required) Admin email"
+__fish_magento_register_command_option setup:install -f -r -l admin-firstname -d "(Required) Admin first name"
+__fish_magento_register_command_option setup:install -f -r -l admin-lastname -d "(Required) Admin last name"
+__fish_magento_register_command_option setup:install -f -l cleanup-database -d "Cleanup database before installation"
+__fish_magento_register_command_option setup:install -f -l sales-order-increment-prefix -d "Sales order number prefix"
+__fish_magento_register_command_option setup:install -f -l use-sample-data -d "Use sample data"
 
 #
 # setup:performance:generate-fixtures
 #
-__fish_magento_register_command_option setup:performance:generate-fixtures -f -s s -l skip-reindex -d "Skip reindex";
+__fish_magento_register_command_option setup:performance:generate-fixtures -f -s s -l skip-reindex -d "Skip reindex"
 
 #
 # setup:rollback
 #
-__fish_magento_register_command_option setup:rollback -s c -l code-file -d "Basename of the code backup file in var/backups";
-__fish_magento_register_command_option setup:rollback -s m -l media-file -d "Basename of the media backup file in var/backups";
-__fish_magento_register_command_option setup:rollback -s d -l db-file -d "Basename of the db backup file in var/backups";
+__fish_magento_register_command_option setup:rollback -s c -l code-file -d "Basename of the code backup file in var/backups"
+__fish_magento_register_command_option setup:rollback -s m -l media-file -d "Basename of the media backup file in var/backups"
+__fish_magento_register_command_option setup:rollback -s d -l db-file -d "Basename of the db backup file in var/backups"
 
 #
 # setup:static-content:deploy
 #
-__fish_magento_register_command_option setup:static-content:deploy -x -a "(__fish_print_magento_languages)" -d "Space-separated list of ISO-636 language codes to output static view files for";
-__fish_magento_register_command_option setup:static-content:deploy -f -s d -l dry-run -d "Simulate deployment only";
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-javascript -d "Don't deploy JavaScript files"; 
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-css -d "Don't deploy CSS files";
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-less -d "Don't deploy LESS files" 
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-images -d "Don't deploy images";
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-fonts -d "Don't deploy font files" 
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-html -d "Don't deploy HTML files" 
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-misc -d "Don't deploy other types of files (.md, .jbf, .csv, etc...)";
-__fish_magento_register_command_option setup:static-content:deploy -f -l no-html-minify -d "Don't minify HTML files";
-__fish_magento_register_command_option setup:static-content:deploy -s t -l theme -d 'Generate static view files only for specified themes (default: "all")';
-__fish_magento_register_command_option setup:static-content:deploy -l exclude-theme -d 'Do not generate files for specified themes (default: "none")';
-__fish_magento_register_command_option setup:static-content:deploy -f -s l -l language -a "(__fish_print_magento_languages)" -d 'Generate files only for specified languages (default: "all")';
-__fish_magento_register_command_option setup:static-content:deploy -f -l exclude-language -d 'Do not generate files for specified languages. (default: "none") (multiple values allowed)';
-__fish_magento_register_command_option setup:static-content:deploy -f -s a -l area -a "(__fish_print_magento_theme_areas)" -d 'Generate files only for specified areas (default: "all")';
-__fish_magento_register_command_option setup:static-content:deploy -f -l exclude-area -a "(__fish_print_magento_theme_areas)" -d 'Do not generate files for specified areas (default: "none")';
-__fish_magento_register_command_option setup:static-content:deploy -x -s j -l jobs -d "Enable parallel processing using specified number of jobs (default: 4)";
-__fish_magento_register_command_option setup:static-content:deploy -f -l symlink-locale -d "Create symlinks for files of locales which are passed for deployment but have no customizations";
+__fish_magento_register_command_option setup:static-content:deploy -x -a "(__fish_print_magento_languages)" -d "Space-separated list of ISO-636 language codes to output static view files for"
+__fish_magento_register_command_option setup:static-content:deploy -f -s d -l dry-run -d "Simulate deployment only"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-javascript -d "Don't deploy JavaScript files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-css -d "Don't deploy CSS files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-less -d "Don't deploy LESS files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-images -d "Don't deploy images"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-fonts -d "Don't deploy font files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-html -d "Don't deploy HTML files"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-misc -d "Don't deploy other types of files (.md, .jbf, .csv, etc...)"
+__fish_magento_register_command_option setup:static-content:deploy -f -l no-html-minify -d "Don't minify HTML files"
+__fish_magento_register_command_option setup:static-content:deploy -s t -l theme -d 'Generate static view files only for specified themes (default: "all")'
+__fish_magento_register_command_option setup:static-content:deploy -l exclude-theme -d 'Do not generate files for specified themes (default: "none")'
+__fish_magento_register_command_option setup:static-content:deploy -f -s l -l language -a "(__fish_print_magento_languages)" -d 'Generate files only for specified languages (default: "all")'
+__fish_magento_register_command_option setup:static-content:deploy -f -l exclude-language -d 'Do not generate files for specified languages. (default: "none") (multiple values allowed)'
+__fish_magento_register_command_option setup:static-content:deploy -f -s a -l area -a "(__fish_print_magento_theme_areas)" -d 'Generate files only for specified areas (default: "all")'
+__fish_magento_register_command_option setup:static-content:deploy -f -l exclude-area -a "(__fish_print_magento_theme_areas)" -d 'Do not generate files for specified areas (default: "none")'
+__fish_magento_register_command_option setup:static-content:deploy -x -s j -l jobs -d "Enable parallel processing using specified number of jobs (default: 4)"
+__fish_magento_register_command_option setup:static-content:deploy -f -l symlink-locale -d "Create symlinks for files of locales which are passed for deployment but have no customizations"
 
 
 #
 # setup:store-config:set
 #
-__fish_magento_register_command_option setup:store-config:set -f -l base-url -a "(__fish_print_magento_url_protocols)" -d "URL the store is supposed to be available at";
-__fish_magento_register_command_option setup:store-config:set -f -l language -a "(__fish_print_magento_languages)" -d "Default language code";
-__fish_magento_register_command_option setup:store-config:set -f -l timezone -d "Default time zone code";
-__fish_magento_register_command_option setup:store-config:set -f -l currency -d "Default currency code";
-__fish_magento_register_command_option setup:store-config:set -f -l use-rewrites -d "Use rewrites";
-__fish_magento_register_command_option setup:store-config:set -f -l use-secure -d "Use secure URLs. Only enable if SSL is available";
-__fish_magento_register_command_option setup:store-config:set -f -l base-url-secure -a "https://" -d "Base URL for SSL connection";
-__fish_magento_register_command_option setup:store-config:set -f -l use-secure-admin -d "Run admin interface with SSL";
-__fish_magento_register_command_option setup:store-config:set -f -l admin-use-security-key -d 'Use security key in admin urls/forms';
+__fish_magento_register_command_option setup:store-config:set -f -l base-url -a "(__fish_print_magento_url_protocols)" -d "URL the store is supposed to be available at"
+__fish_magento_register_command_option setup:store-config:set -f -l language -a "(__fish_print_magento_languages)" -d "Default language code"
+__fish_magento_register_command_option setup:store-config:set -f -l timezone -d "Default time zone code"
+__fish_magento_register_command_option setup:store-config:set -f -l currency -d "Default currency code"
+__fish_magento_register_command_option setup:store-config:set -f -l use-rewrites -d "Use rewrites"
+__fish_magento_register_command_option setup:store-config:set -f -l use-secure -d "Use secure URLs. Only enable if SSL is available"
+__fish_magento_register_command_option setup:store-config:set -f -l base-url-secure -a "https://" -d "Base URL for SSL connection"
+__fish_magento_register_command_option setup:store-config:set -f -l use-secure-admin -d "Run admin interface with SSL"
+__fish_magento_register_command_option setup:store-config:set -f -l admin-use-security-key -d 'Use security key in admin urls/forms'
 
 #
 # setup:upgrade
 #
-__fish_magento_register_command_option setup:upgrade -l keep-generated -d "Prevents generated files from being deleted";
+__fish_magento_register_command_option setup:upgrade -l keep-generated -d "Prevents generated files from being deleted"
 
 #
 # theme:uninstall
 #
-__fish_magento_register_command_option theme:uninstall -f -l backup-code -d "Take code backup (excluding temporary files)";
-__fish_magento_register_command_option theme:uninstall -f -s c -l clear-static-content -d "Clear generated static view files";
+__fish_magento_register_command_option theme:uninstall -f -l backup-code -d "Take code backup (excluding temporary files)"
+__fish_magento_register_command_option theme:uninstall -f -s c -l clear-static-content -d "Clear generated static view files"
diff --git a/share/completions/makepkg.fish b/share/completions/makepkg.fish
index 6fc9cfb97..11e8d548e 100644
--- a/share/completions/makepkg.fish
+++ b/share/completions/makepkg.fish
@@ -1,40 +1,40 @@
-complete -c makepkg -s A -l 'ignorearch'    -d 'Ignore missing or incomplete arch field'
-complete -c makepkg -s c -l 'clean'         -d 'Clean up work files after build'
-complete -c makepkg      -l 'config'        -d 'Use alternate config <file>'
-complete -c makepkg -s d -l 'nodeps'        -d 'Do not perform dependency checks'
-complete -c makepkg -s e -l 'noextract'     -d 'Do not extract source files'
-complete -c makepkg      -l 'verifysource'  -d 'Only perform integrity checks'
-complete -c makepkg -s f -l 'force'         -d 'Force rebuild of the package'
-complete -c makepkg -s g -l 'geninteg'      -d 'Generate integrity checks'
-complete -c makepkg      -l 'skipinteg'     -d 'Do not perform integrity checks'
-complete -c makepkg      -l 'skipchecksums' -d 'Do not verify checksums'
-complete -c makepkg      -l 'skippgpcheck'  -d 'Do not verify PGP signatures'
-complete -c makepkg -s h -l 'help'          -d 'Display syntax and command line options'
-complete -c makepkg      -l 'holdver'       -d 'No automatic bump of pkgver'
-complete -c makepkg -s i -l 'install'       -d 'Install the package after build'
-complete -c makepkg -s L -l 'log'           -d 'Enable makepkg build logging'
-complete -c makepkg -s m -l 'nocolor'       -d 'Disable color in output messages'
-complete -c makepkg -s o -l 'nobuild'       -d 'Only download and extract files'
-complete -c makepkg -s p                    -d 'Use alternative <buildscript>'
-complete -c makepkg -s r -l 'rmdeps'        -d 'Remove installed deps after build'
-complete -c makepkg -s R -l 'repackage'     -d 'Repackage without rebuilding'
-complete -c makepkg -s s -l 'syncdeps'      -d 'Install missing dependencies'
-complete -c makepkg -s S -l 'source'        -d 'Build a source-only tarball for AUR'
-complete -c makepkg -s V -l 'version'       -d 'Display the version and exit'
-complete -c makepkg -s C -l 'cleanbuild'    -d 'Remove the srcdir before building the package'
-complete -c makepkg      -l 'allsource'     -d 'Build a source-only GPL tarball for AUR'
-complete -c makepkg      -l 'pkg'           -d 'Only build <packages> from a split package'
-complete -c makepkg      -l 'check'         -d 'Run the check function in the PKGBUILD'
-complete -c makepkg      -l 'noarchive'     -d 'Do not create the archive'
-complete -c makepkg      -l 'nocheck'       -d 'Do not run the check function in the PKGBUILD'
-complete -c makepkg      -l 'sign'          -d 'Sign the resulting package with gpg'
-complete -c makepkg      -l 'nosign'        -d 'Do not create a signature for the package'
-complete -c makepkg      -l 'key'           -d 'Specify a <key> to use when signing'
-complete -c makepkg      -l 'noconfirm'     -d 'Passed to pacman: Do not ask for confirmation'
-complete -c makepkg      -l 'needed'        -d 'Passed to pacman: Only install what is needed'
-complete -c makepkg      -l 'asdeps'        -d 'Passed to pacman: Install as dependencies'
-complete -c makepkg      -l 'noprogressbar' -d 'Passed to pacman: Do not display a progress bar'
+complete -c makepkg -s A -l 'ignorearch' -d 'Ignore missing or incomplete arch field'
+complete -c makepkg -s c -l 'clean' -d 'Clean up work files after build'
+complete -c makepkg -l 'config' -d 'Use alternate config <file>'
+complete -c makepkg -s d -l 'nodeps' -d 'Do not perform dependency checks'
+complete -c makepkg -s e -l 'noextract' -d 'Do not extract source files'
+complete -c makepkg -l 'verifysource' -d 'Only perform integrity checks'
+complete -c makepkg -s f -l 'force' -d 'Force rebuild of the package'
+complete -c makepkg -s g -l 'geninteg' -d 'Generate integrity checks'
+complete -c makepkg -l 'skipinteg' -d 'Do not perform integrity checks'
+complete -c makepkg -l 'skipchecksums' -d 'Do not verify checksums'
+complete -c makepkg -l 'skippgpcheck' -d 'Do not verify PGP signatures'
+complete -c makepkg -s h -l 'help' -d 'Display syntax and command line options'
+complete -c makepkg -l 'holdver' -d 'No automatic bump of pkgver'
+complete -c makepkg -s i -l 'install' -d 'Install the package after build'
+complete -c makepkg -s L -l 'log' -d 'Enable makepkg build logging'
+complete -c makepkg -s m -l 'nocolor' -d 'Disable color in output messages'
+complete -c makepkg -s o -l 'nobuild' -d 'Only download and extract files'
+complete -c makepkg -s p -d 'Use alternative <buildscript>'
+complete -c makepkg -s r -l 'rmdeps' -d 'Remove installed deps after build'
+complete -c makepkg -s R -l 'repackage' -d 'Repackage without rebuilding'
+complete -c makepkg -s s -l 'syncdeps' -d 'Install missing dependencies'
+complete -c makepkg -s S -l 'source' -d 'Build a source-only tarball for AUR'
+complete -c makepkg -s V -l 'version' -d 'Display the version and exit'
+complete -c makepkg -s C -l 'cleanbuild' -d 'Remove the srcdir before building the package'
+complete -c makepkg -l 'allsource' -d 'Build a source-only GPL tarball for AUR'
+complete -c makepkg -l 'pkg' -d 'Only build <packages> from a split package'
+complete -c makepkg -l 'check' -d 'Run the check function in the PKGBUILD'
+complete -c makepkg -l 'noarchive' -d 'Do not create the archive'
+complete -c makepkg -l 'nocheck' -d 'Do not run the check function in the PKGBUILD'
+complete -c makepkg -l 'sign' -d 'Sign the resulting package with gpg'
+complete -c makepkg -l 'nosign' -d 'Do not create a signature for the package'
+complete -c makepkg -l 'key' -d 'Specify a <key> to use when signing'
+complete -c makepkg -l 'noconfirm' -d 'Passed to pacman: Do not ask for confirmation'
+complete -c makepkg -l 'needed' -d 'Passed to pacman: Only install what is needed'
+complete -c makepkg -l 'asdeps' -d 'Passed to pacman: Install as dependencies'
+complete -c makepkg -l 'noprogressbar' -d 'Passed to pacman: Do not display a progress bar'
 
 # Since pacman 5
-complete -c makepkg      -l 'packagelist' -d 'List all packages that would be built'
-complete -c makepkg      -l 'printsrcinfo' -d 'Print SRCINFO to stdout'
+complete -c makepkg -l 'packagelist' -d 'List all packages that would be built'
+complete -c makepkg -l 'printsrcinfo' -d 'Print SRCINFO to stdout'
diff --git a/share/completions/mc.fish b/share/completions/mc.fish
index 0905db283..218c680d6 100644
--- a/share/completions/mc.fish
+++ b/share/completions/mc.fish
@@ -1,24 +1,24 @@
 
-complete -c mc -s a -l stickchars        -d 'No graphic chars for line drawing'
-complete -c mc -s b -l nocolor           -d 'Force black and white display'
-complete -c mc -s c -l color             -d 'Force color mode'
-complete -c mc -s C -l colors            -d 'Specify a different color set'
-complete -c mc -s S                      -d 'Specify a name of skin'
-complete -c mc -s d -l nomouse           -d 'Disable mouse support'
-complete -c mc -s e -l edit              -d 'Start the internal editor with FILE'
-complete -c mc -s f -l datadir           -d 'Display the compiled-in search paths'
-complete -c mc -s F -l datadir-info      -d 'Display extended info about compiled-in paths'
-complete -c mc      -l configure-options -d 'Display configure options'
-complete -c mc -s k -l resetsoft         -d 'Reset softkeys to their default'
-complete -c mc -s K                      -d 'Specify a keymap FILE'
-complete -c mc      -l nokeymap          -d 'Use default hardcoded keys'
-complete -c mc -s l -l ftplog            -d 'Save the ftpfs dialog with the server in FILE'
-complete -c mc -s P -l printwd           -d 'Print the last working directory to FILE'
-complete -c mc -s s                      -d 'Set alternative mode drawing of frameworks'
-complete -c mc -s t -l termcap           -d 'Use the TERMCAP variable for terminal info'
-complete -c mc -s u -l nosubshell        -d 'Disable use of the concurrent shell'
-complete -c mc -s U -l subshell          -d 'Enable use of the concurrent shell'
-complete -c mc -s v -l view              -d 'Start the internal viewer with FILE'
-complete -c mc -s V -l version           -d 'Display the version of the program'
-complete -c mc -s x -l xterm             -d 'Force xterm mode'
-complete -c mc -s g -l oldmouse          -d 'Force a "normal tracking" mouse mode'
+complete -c mc -s a -l stickchars -d 'No graphic chars for line drawing'
+complete -c mc -s b -l nocolor -d 'Force black and white display'
+complete -c mc -s c -l color -d 'Force color mode'
+complete -c mc -s C -l colors -d 'Specify a different color set'
+complete -c mc -s S -d 'Specify a name of skin'
+complete -c mc -s d -l nomouse -d 'Disable mouse support'
+complete -c mc -s e -l edit -d 'Start the internal editor with FILE'
+complete -c mc -s f -l datadir -d 'Display the compiled-in search paths'
+complete -c mc -s F -l datadir-info -d 'Display extended info about compiled-in paths'
+complete -c mc -l configure-options -d 'Display configure options'
+complete -c mc -s k -l resetsoft -d 'Reset softkeys to their default'
+complete -c mc -s K -d 'Specify a keymap FILE'
+complete -c mc -l nokeymap -d 'Use default hardcoded keys'
+complete -c mc -s l -l ftplog -d 'Save the ftpfs dialog with the server in FILE'
+complete -c mc -s P -l printwd -d 'Print the last working directory to FILE'
+complete -c mc -s s -d 'Set alternative mode drawing of frameworks'
+complete -c mc -s t -l termcap -d 'Use the TERMCAP variable for terminal info'
+complete -c mc -s u -l nosubshell -d 'Disable use of the concurrent shell'
+complete -c mc -s U -l subshell -d 'Enable use of the concurrent shell'
+complete -c mc -s v -l view -d 'Start the internal viewer with FILE'
+complete -c mc -s V -l version -d 'Display the version of the program'
+complete -c mc -s x -l xterm -d 'Force xterm mode'
+complete -c mc -s g -l oldmouse -d 'Force a "normal tracking" mouse mode'
diff --git a/share/completions/md5sum.fish b/share/completions/md5sum.fish
index 3549e7c5a..a759dfc39 100644
--- a/share/completions/md5sum.fish
+++ b/share/completions/md5sum.fish
@@ -1,10 +1,10 @@
 complete -c md5sum -d "Compute and check message digest" -r
 complete -c md5sum -s b -l binary -d 'Read in binary mode'
-complete -c md5sum -s c -l check  -d "Read sums from files and check them"
-complete -c md5sum -s t -l text   -d 'Read in text mode'
-complete -c md5sum -l quiet       -d 'Don''t print OK for each successfully verified file'
-complete -c md5sum -l status      -d 'Don''t output anything, status code shows success'
-complete -c md5sum -s w -l warn   -d 'Warn about improperly formatted checksum lines'
-complete -c md5sum -l strict      -d 'With --check, exit non-zero for any invalid input'
-complete -c md5sum -l help        -d 'Display help text'
-complete -c md5sum -l version     -d 'Output version information and exit'
+complete -c md5sum -s c -l check -d "Read sums from files and check them"
+complete -c md5sum -s t -l text -d 'Read in text mode'
+complete -c md5sum -l quiet -d 'Don''t print OK for each successfully verified file'
+complete -c md5sum -l status -d 'Don''t output anything, status code shows success'
+complete -c md5sum -s w -l warn -d 'Warn about improperly formatted checksum lines'
+complete -c md5sum -l strict -d 'With --check, exit non-zero for any invalid input'
+complete -c md5sum -l help -d 'Display help text'
+complete -c md5sum -l version -d 'Output version information and exit'
diff --git a/share/completions/mdadm.fish b/share/completions/mdadm.fish
index 2f711eab8..320f3debd 100644
--- a/share/completions/mdadm.fish
+++ b/share/completions/mdadm.fish
@@ -10,110 +10,110 @@
 #     as their absence has already been checked, because this absence caused evaluation of __fish_not_contain_opt
 
 function __fish_mdadm_metadata_options
-	echo -e "0\t"(_ "Use original 0.90 format superblock")
-	echo -e "0.90\t"(_ "Use original 0.90 format superblock")
-	echo -e "1\t"(_ "Use last 1.x format superblock")
-	echo -e "default\t"(_ "Use last 1.x format superblock")
-	echo -e "1.0\t"(_ "Use 1.0 format superblock")
-	echo -e "1.1\t"(_ "Use 1.1 format superblock")
-	echo -e "1.2\t"(_ "Use 1.2 format superblock")
-	echo -e "ddf\t"(_ "Use DDF (Disk Data Format) format")
-	echo -e "imsm\t"(_ "Use Intel(R) Matrix Storage Manager format")
+    echo -e "0\t"(_ "Use original 0.90 format superblock")
+    echo -e "0.90\t"(_ "Use original 0.90 format superblock")
+    echo -e "1\t"(_ "Use last 1.x format superblock")
+    echo -e "default\t"(_ "Use last 1.x format superblock")
+    echo -e "1.0\t"(_ "Use 1.0 format superblock")
+    echo -e "1.1\t"(_ "Use 1.1 format superblock")
+    echo -e "1.2\t"(_ "Use 1.2 format superblock")
+    echo -e "ddf\t"(_ "Use DDF (Disk Data Format) format")
+    echo -e "imsm\t"(_ "Use Intel(R) Matrix Storage Manager format")
 end
 
 function __fish_mdadm_level_options
-	echo -e "linear\t"(_ "JBOD")
-	echo -e "raid0\t"(_ "Stripped volume (RAID 0)")
-	echo -e "0\t"(_ "Stripped volume (RAID 0)")
-	echo -e "stripe\t"(_ "Stripped volume (RAID 0)")
-	echo -e "raid1\t"(_ "Mirrored volume (RAID 1)")
-	echo -e "1\t"(_ "Mirrored volume (RAID 1)")
-	echo -e "mirror\t"(_ "Mirrored volume (RAID 1)")
-	echo -e "raid4\t"(_ "Stripped volume with parity disk (RAID 4)")
-	echo -e "4\t"(_ "Stripped volume with parity disk (RAID 4)")
-	echo -e "raid5\t"(_ "Stripped volume with distributed parity (RAID 5)")
-	echo -e "5\t"(_ "Stripped volume with distributed parity (RAID 5)")
-	echo -e "raid6\t"(_ "Stripped volume with double distributed parity (RAID 5)")
-	echo -e "6\t"(_ "Stripped volume with double distributed parity (RAID 5)")
-	echo -e "raid10\t"(_ "Mirrored stripped volume (RAID 10)")
-	echo -e "10\t"(_ "Mirrored stripped volume (RAID 10)")
-	echo -e "multipath\t"(_ "Multiple access device, AKA multipath (deprecated)")
-	echo -e "mp\t"(_ "Multiple access device, AKA multipath (deprecated)")
-	echo -e "faulty\t"(_ "Pseudo RAID layer for single device (akin faulty RAID 1)")
-	echo -e "container\t"(_ "Container") # To be clarified
+    echo -e "linear\t"(_ "JBOD")
+    echo -e "raid0\t"(_ "Stripped volume (RAID 0)")
+    echo -e "0\t"(_ "Stripped volume (RAID 0)")
+    echo -e "stripe\t"(_ "Stripped volume (RAID 0)")
+    echo -e "raid1\t"(_ "Mirrored volume (RAID 1)")
+    echo -e "1\t"(_ "Mirrored volume (RAID 1)")
+    echo -e "mirror\t"(_ "Mirrored volume (RAID 1)")
+    echo -e "raid4\t"(_ "Stripped volume with parity disk (RAID 4)")
+    echo -e "4\t"(_ "Stripped volume with parity disk (RAID 4)")
+    echo -e "raid5\t"(_ "Stripped volume with distributed parity (RAID 5)")
+    echo -e "5\t"(_ "Stripped volume with distributed parity (RAID 5)")
+    echo -e "raid6\t"(_ "Stripped volume with double distributed parity (RAID 5)")
+    echo -e "6\t"(_ "Stripped volume with double distributed parity (RAID 5)")
+    echo -e "raid10\t"(_ "Mirrored stripped volume (RAID 10)")
+    echo -e "10\t"(_ "Mirrored stripped volume (RAID 10)")
+    echo -e "multipath\t"(_ "Multiple access device, AKA multipath (deprecated)")
+    echo -e "mp\t"(_ "Multiple access device, AKA multipath (deprecated)")
+    echo -e "faulty\t"(_ "Pseudo RAID layer for single device (akin faulty RAID 1)")
+    echo -e "container\t"(_ "Container") # To be clarified
 end
 
 function __fish_mdadm_layout_options # To be clarified
-	echo -e "left-asymmetric"
-	echo -e "left-symmetric"
-	echo -e "right-asymmetric"
-	echo -e "right-symmetric"
-	echo -e "la\t"(_ "Alias of left-asymmetric")
-	echo -e "ra\t"(_ "Alias of right-asymmetric")
-	echo -e "ls\t"(_ "Alias of left-symmetric")
-	echo -e "rs\t"(_ "Alias of right-symmetric")
-	echo -e "parity-first"
-	echo -e "parity-last"
-	echo -e "ddf-zero-restart"
-	echo -e "ddf-N-restart"
-	echo -e "ddf-N-continue"
-	echo -e "left-symmetric-6"
-	echo -e "right-symmetric-6"
-	echo -e "left-asymmetric-6"
-	echo -e "right-asymmetric-6"
-	echo -e "parity-first-6"
-	echo -e "write-transient"
-	echo -e "wt\t"(_ "Alias of write-transient")
-	echo -e "read-transient"
-	echo -e "rt\t"(_ "Alias of read-transient")
-	echo -e "write-persistent"
-	echo -e "wp\t"(_ "Alias of write-persistent")
-	echo -e "read-persistent"
-	echo -e "rp\t"(_ "Alias of read-persistent")
-	echo -e "write-all"
-	echo -e "read-fixable"
-	echo -e "rf\t"(_ "Alias of read-fixable")
-	echo -e "clear"
-	echo -e "flush"
-	echo -e "none"
-	echo -e "n"
-	echo -e "o"
-	echo -e "f"
-	echo -e "normalise"
-	echo -e "preserve"
+    echo -e "left-asymmetric"
+    echo -e "left-symmetric"
+    echo -e "right-asymmetric"
+    echo -e "right-symmetric"
+    echo -e "la\t"(_ "Alias of left-asymmetric")
+    echo -e "ra\t"(_ "Alias of right-asymmetric")
+    echo -e "ls\t"(_ "Alias of left-symmetric")
+    echo -e "rs\t"(_ "Alias of right-symmetric")
+    echo -e "parity-first"
+    echo -e "parity-last"
+    echo -e "ddf-zero-restart"
+    echo -e "ddf-N-restart"
+    echo -e "ddf-N-continue"
+    echo -e "left-symmetric-6"
+    echo -e "right-symmetric-6"
+    echo -e "left-asymmetric-6"
+    echo -e "right-asymmetric-6"
+    echo -e "parity-first-6"
+    echo -e "write-transient"
+    echo -e "wt\t"(_ "Alias of write-transient")
+    echo -e "read-transient"
+    echo -e "rt\t"(_ "Alias of read-transient")
+    echo -e "write-persistent"
+    echo -e "wp\t"(_ "Alias of write-persistent")
+    echo -e "read-persistent"
+    echo -e "rp\t"(_ "Alias of read-persistent")
+    echo -e "write-all"
+    echo -e "read-fixable"
+    echo -e "rf\t"(_ "Alias of read-fixable")
+    echo -e "clear"
+    echo -e "flush"
+    echo -e "none"
+    echo -e "n"
+    echo -e "o"
+    echo -e "f"
+    echo -e "normalise"
+    echo -e "preserve"
 end
 
 function __fish_mdadm_level_options
-	echo -e "yes\t"(_ "Use standard format (default)")
-	echo -e "md\t"(_ "Use a non-partitionable array")
-	echo -e "mdp\t"(_ "Use a partitionable array")
-	echo -e "part\t"(_ "Use a partitionable array")
-	echo -e "p\t"(_ "Use a partitionable array")
+    echo -e "yes\t"(_ "Use standard format (default)")
+    echo -e "md\t"(_ "Use a non-partitionable array")
+    echo -e "mdp\t"(_ "Use a partitionable array")
+    echo -e "part\t"(_ "Use a partitionable array")
+    echo -e "p\t"(_ "Use a partitionable array")
 end
 
 function __fish_mdadm_update_options
-	echo -e "sparc2.2\t"(_ "Remove superblock misalignement from SPARC kernel 2.2")
-	echo -e "summaries\t"(_ "Correct superblock summaries")
-	echo -e "uuid\t"(_ "Update array UUID")
-	echo -e "name\t"(_ "Update array name")
-	echo -e "nodes\t"(_ "Update array nodes")
-	echo -e "homehost\t"(_ "Update array homehost")
-	echo -e "home-cluster\t"(_ "Update array cluster name")
-	echo -e "resync\t"(_ "Mark the array as dirty, thus forcing resync")
-	echo -e "byteorder\t"(_ "Reverse superblock endianness")
-	echo -e "devicesize\t"(_ "Refresh device size")
-	echo -e "no-bitmap\t"(_ "Assume bitmap absence")
-	echo -e "bbl\t"(_ "Reserve space for bad block list")
-	echo -e "no-bbl\t"(_ "Free reserved space for bad block list")
-	echo -e "metadata\t"(_ "Convert 0.90 metadata to 1.0")
-	echo -e "super-minor\t"(_ "Reset preferred minor to current one")
+    echo -e "sparc2.2\t"(_ "Remove superblock misalignement from SPARC kernel 2.2")
+    echo -e "summaries\t"(_ "Correct superblock summaries")
+    echo -e "uuid\t"(_ "Update array UUID")
+    echo -e "name\t"(_ "Update array name")
+    echo -e "nodes\t"(_ "Update array nodes")
+    echo -e "homehost\t"(_ "Update array homehost")
+    echo -e "home-cluster\t"(_ "Update array cluster name")
+    echo -e "resync\t"(_ "Mark the array as dirty, thus forcing resync")
+    echo -e "byteorder\t"(_ "Reverse superblock endianness")
+    echo -e "devicesize\t"(_ "Refresh device size")
+    echo -e "no-bitmap\t"(_ "Assume bitmap absence")
+    echo -e "bbl\t"(_ "Reserve space for bad block list")
+    echo -e "no-bbl\t"(_ "Free reserved space for bad block list")
+    echo -e "metadata\t"(_ "Convert 0.90 metadata to 1.0")
+    echo -e "super-minor\t"(_ "Reset preferred minor to current one")
 end
 
 function __fish_mdadm_action_options
-	echo -e "idle\t"(_ "Abort currently running actions")
-	echo -e "frozen\t"(_ "Abort currently running actions, prevent their restart")
-	echo -e "check\t"(_ "Scrub the array (i.e. check constistency)")
-	echo -e "repair\t"(_ "Check, then resync")
+    echo -e "idle\t"(_ "Abort currently running actions")
+    echo -e "frozen\t"(_ "Abort currently running actions, prevent their restart")
+    echo -e "check\t"(_ "Scrub the array (i.e. check constistency)")
+    echo -e "repair\t"(_ "Check, then resync")
 end
 
 # In the next 7 lines, the tested option is maintained into the search list to prevent suggesting it if it has already been used, as they cannot be used twice
diff --git a/share/completions/meson.fish b/share/completions/meson.fish
index 07ca928d5..9a3dc1222 100644
--- a/share/completions/meson.fish
+++ b/share/completions/meson.fish
@@ -1,40 +1,40 @@
 # Completions for the meson build system (http://mesonbuild.com/)
 
 set -l basic_arguments \
-	"h,help,show help message and exit" \
-	",stdsplit,Split stdout and stderr in test logs" \
-	",errorlogs,Print logs from failing test(s)" \
-	",werror,Treat warnings as errors" \
-	",strip,Strip targets on install" \
-	"v,version,Show version number and exit"
+    "h,help,show help message and exit" \
+    ",stdsplit,Split stdout and stderr in test logs" \
+    ",errorlogs,Print logs from failing test(s)" \
+    ",werror,Treat warnings as errors" \
+    ",strip,Strip targets on install" \
+    "v,version,Show version number and exit"
 
 set -l dir_arguments \
-	",localedir,Locale data directory [share/locale]" \
-	",sbindir,System executable directory [sbin]" \
-	",infodir,Info page directory [share/info]" \
-	",prefix,Installation prefix [/usr/local]" \
-	",mandir,Manual page directory [share/man]" \
-	",datadir,Data file directory [share]" \
-	",bindir,Executable directory [bin]" \
-	",sharedstatedir,Arch-agnostic data directory [com]" \
-	",libdir,Library directory [system default]" \
-	",localstatedir,Localstate data directory [var]" \
-	",libexecdir,Library executable directory [libexec]" \
-	",includedir,Header file directory [include]" \
-	",sysconfdir,Sysconf data directory [etc]"
+    ",localedir,Locale data directory [share/locale]" \
+    ",sbindir,System executable directory [sbin]" \
+    ",infodir,Info page directory [share/info]" \
+    ",prefix,Installation prefix [/usr/local]" \
+    ",mandir,Manual page directory [share/man]" \
+    ",datadir,Data file directory [share]" \
+    ",bindir,Executable directory [bin]" \
+    ",sharedstatedir,Arch-agnostic data directory [com]" \
+    ",libdir,Library directory [system default]" \
+    ",localstatedir,Localstate data directory [var]" \
+    ",libexecdir,Library executable directory [libexec]" \
+    ",includedir,Header file directory [include]" \
+    ",sysconfdir,Sysconf data directory [etc]"
 
 for arg in $basic_arguments
-	set -l parts (string split , -- $arg)
-	if not string match -q "" -- $parts[1]
-		complete -c meson -s "$parts[1]" -l "$parts[2]" -d "$parts[3]"
-	else
-		complete -c meson -l "$parts[2]" -d "$parts[3]"
-	end
+    set -l parts (string split , -- $arg)
+    if not string match -q "" -- $parts[1]
+        complete -c meson -s "$parts[1]" -l "$parts[2]" -d "$parts[3]"
+    else
+        complete -c meson -l "$parts[2]" -d "$parts[3]"
+    end
 end
 
 for arg in $dir_arguments
-	set -l parts (string split , -- $arg)
-	complete -c meson -l "$parts[2]" -d "$parts[3]" -xa '(__fish_complete_directories)'
+    set -l parts (string split , -- $arg)
+    complete -c meson -l "$parts[2]" -d "$parts[3]" -xa '(__fish_complete_directories)'
 end
 
 complete -c meson -s "D" -d "Set value of an option (-D foo=bar)"
diff --git a/share/completions/mix.fish b/share/completions/mix.fish
index 6fa365f9c..cce3fa542 100644
--- a/share/completions/mix.fish
+++ b/share/completions/mix.fish
@@ -1,53 +1,53 @@
 # Completions for the Elixir build tool mix
 
 function __fish_mix_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 function __fish_mix_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 
-complete -f -c mix -n '__fish_mix_needs_command' -a app.start         -d "Starts all registered apps"
-complete -f -c mix -n '__fish_mix_needs_command' -a archive           -d "Lists all archives"
-complete -f -c mix -n '__fish_mix_needs_command' -a archive.build     -d "Archives this project into a .ez file"
-complete    -c mix -n '__fish_mix_needs_command' -a archive.install   -d "Installs an archive locally"
-complete    -c mix -n '__fish_mix_needs_command' -a archive.uninstall -d "Uninstalls archives"
-complete -f -c mix -n '__fish_mix_needs_command' -a clean             -d "Deletes generated application files"
-complete -f -c mix -n '__fish_mix_needs_command' -a cmd               -d "Executes the given command"
-complete    -c mix -n '__fish_mix_needs_command' -a compile           -d "Compiles source files"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps              -d "Lists dependencies and their status"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.clean        -d "Deletes the given dependencies' files"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.compile      -d "Compiles dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.get          -d "Gets all out of date dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.unlock       -d "Unlocks the given dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a deps.update       -d "Updates the given dependencies"
-complete -f -c mix -n '__fish_mix_needs_command' -a do                -d "Executes the tasks separated by comma"
-complete -f -c mix -n '__fish_mix_needs_command' -a escript.build     -d "Builds an escript for the project"
-complete -f -c mix -n '__fish_mix_needs_command' -a help              -d "Prints help information for tasks"
-complete    -c mix -n '__fish_mix_needs_command' -a loadconfig        -d "Loads and persists the given configuration"
-complete -f -c mix -n '__fish_mix_needs_command' -a local             -d "Lists local tasks"
-complete -f -c mix -n '__fish_mix_needs_command' -a local.hex         -d "Installs Hex locally"
+complete -f -c mix -n '__fish_mix_needs_command' -a app.start -d "Starts all registered apps"
+complete -f -c mix -n '__fish_mix_needs_command' -a archive -d "Lists all archives"
+complete -f -c mix -n '__fish_mix_needs_command' -a archive.build -d "Archives this project into a .ez file"
+complete -c mix -n '__fish_mix_needs_command' -a archive.install -d "Installs an archive locally"
+complete -c mix -n '__fish_mix_needs_command' -a archive.uninstall -d "Uninstalls archives"
+complete -f -c mix -n '__fish_mix_needs_command' -a clean -d "Deletes generated application files"
+complete -f -c mix -n '__fish_mix_needs_command' -a cmd -d "Executes the given command"
+complete -c mix -n '__fish_mix_needs_command' -a compile -d "Compiles source files"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps -d "Lists dependencies and their status"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.clean -d "Deletes the given dependencies' files"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.compile -d "Compiles dependencies"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.get -d "Gets all out of date dependencies"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.unlock -d "Unlocks the given dependencies"
+complete -f -c mix -n '__fish_mix_needs_command' -a deps.update -d "Updates the given dependencies"
+complete -f -c mix -n '__fish_mix_needs_command' -a do -d "Executes the tasks separated by comma"
+complete -f -c mix -n '__fish_mix_needs_command' -a escript.build -d "Builds an escript for the project"
+complete -f -c mix -n '__fish_mix_needs_command' -a help -d "Prints help information for tasks"
+complete -c mix -n '__fish_mix_needs_command' -a loadconfig -d "Loads and persists the given configuration"
+complete -f -c mix -n '__fish_mix_needs_command' -a local -d "Lists local tasks"
+complete -f -c mix -n '__fish_mix_needs_command' -a local.hex -d "Installs Hex locally"
 complete -f -c mix -n '__fish_mix_needs_command' -a local.public_keys -d "Manages public keys"
-complete -f -c mix -n '__fish_mix_needs_command' -a local.rebar       -d "Installs rebar locally"
-complete    -c mix -n '__fish_mix_needs_command' -a new               -d "Creates a new Elixir project"
-complete    -c mix -n '__fish_mix_needs_command' -a profile.fprof     -d "Profiles the given file or expression with fprof"
-complete -f -c mix -n '__fish_mix_needs_command' -a run               -d "Runs the given file or expression"
-complete -f -c mix -n '__fish_mix_needs_command' -a test              -d "Runs a project's tests"
+complete -f -c mix -n '__fish_mix_needs_command' -a local.rebar -d "Installs rebar locally"
+complete -c mix -n '__fish_mix_needs_command' -a new -d "Creates a new Elixir project"
+complete -c mix -n '__fish_mix_needs_command' -a profile.fprof -d "Profiles the given file or expression with fprof"
+complete -f -c mix -n '__fish_mix_needs_command' -a run -d "Runs the given file or expression"
+complete -f -c mix -n '__fish_mix_needs_command' -a test -d "Runs a project's tests"
 
 # archive.build subcommand
-complete    -c mix -n '__fish_mix_using_command archive.build' -s i -d "specify input directory"
+complete -c mix -n '__fish_mix_using_command archive.build' -s i -d "specify input directory"
 complete -f -c mix -n '__fish_mix_using_command archive.build' -s o -d "specify output file name"
 complete -f -c mix -n '__fish_mix_using_command archive.build' -l no-compile -d "skip compilation"
 
@@ -59,10 +59,10 @@ complete -f -c mix -n '__fish_mix_using_command escript.build' -l force -d "forc
 complete -f -c mix -n '__fish_mix_using_command escript.build' -l no-compile -d "skips compilation to .beam files"
 
 # new subcommand
-complete -f -c mix -n '__fish_mix_using_command new' -l sup      -d "can be given to generate an OTP application skeleton including a supervision tree"
+complete -f -c mix -n '__fish_mix_using_command new' -l sup -d "can be given to generate an OTP application skeleton including a supervision tree"
 complete -f -c mix -n '__fish_mix_using_command new' -l umbrella -d "can be given to generate an umbrella project"
-complete -f -c mix -n '__fish_mix_using_command new' -l app      -d "can be given in order to name the OTP application"
-complete -f -c mix -n '__fish_mix_using_command new' -l module   -d "can be given in order to name the modules in the generated code skeleton"
+complete -f -c mix -n '__fish_mix_using_command new' -l app -d "can be given in order to name the OTP application"
+complete -f -c mix -n '__fish_mix_using_command new' -l module -d "can be given in order to name the modules in the generated code skeleton"
 
 # run subcommand
 complete -c mix -n '__fish_mix_using_command run' -l config -s c -d "loads the given configuration file"
@@ -90,29 +90,29 @@ complete -c mix -n '__fish_mix_using_command test' -l seed -d "seeds the random
 complete -c mix -n '__fish_mix_using_command test' -l timeout -d "set the timeout for the tests"
 
 # help subcommand
-complete -f -c mix -n '__fish_mix_using_command help' -a app.start         -d "Starts all registered apps"
-complete -f -c mix -n '__fish_mix_using_command help' -a archive           -d "Lists all archives"
-complete -f -c mix -n '__fish_mix_using_command help' -a archive.build     -d "Archives this project into a .ez file"
-complete -f -c mix -n '__fish_mix_using_command help' -a archive.install   -d "Installs an archive locally"
+complete -f -c mix -n '__fish_mix_using_command help' -a app.start -d "Starts all registered apps"
+complete -f -c mix -n '__fish_mix_using_command help' -a archive -d "Lists all archives"
+complete -f -c mix -n '__fish_mix_using_command help' -a archive.build -d "Archives this project into a .ez file"
+complete -f -c mix -n '__fish_mix_using_command help' -a archive.install -d "Installs an archive locally"
 complete -f -c mix -n '__fish_mix_using_command help' -a archive.uninstall -d "Uninstalls archives"
-complete -f -c mix -n '__fish_mix_using_command help' -a clean             -d "Deletes generated application files"
-complete -f -c mix -n '__fish_mix_using_command help' -a cmd               -d "Executes the given command"
-complete -f -c mix -n '__fish_mix_using_command help' -a compile           -d "Compiles source files"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps              -d "Lists dependencies and their status"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.clean        -d "Deletes the given dependencies' files"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.compile      -d "Compiles dependencies"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.get          -d "Gets all out of date dependencies"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.unlock       -d "Unlocks the given dependencies"
-complete -f -c mix -n '__fish_mix_using_command help' -a deps.update       -d "Updates the given dependencies"
-complete -f -c mix -n '__fish_mix_using_command help' -a do                -d "Executes the tasks separated by comma"
-complete -f -c mix -n '__fish_mix_using_command help' -a escript.build     -d "Builds an escript for the project"
-complete -f -c mix -n '__fish_mix_using_command help' -a help              -d "Prints help information for tasks"
-complete -f -c mix -n '__fish_mix_using_command help' -a loadconfig        -d "Loads and persists the given configuration"
-complete -f -c mix -n '__fish_mix_using_command help' -a local             -d "Lists local tasks"
-complete -f -c mix -n '__fish_mix_using_command help' -a local.hex         -d "Installs Hex locally"
+complete -f -c mix -n '__fish_mix_using_command help' -a clean -d "Deletes generated application files"
+complete -f -c mix -n '__fish_mix_using_command help' -a cmd -d "Executes the given command"
+complete -f -c mix -n '__fish_mix_using_command help' -a compile -d "Compiles source files"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps -d "Lists dependencies and their status"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.clean -d "Deletes the given dependencies' files"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.compile -d "Compiles dependencies"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.get -d "Gets all out of date dependencies"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.unlock -d "Unlocks the given dependencies"
+complete -f -c mix -n '__fish_mix_using_command help' -a deps.update -d "Updates the given dependencies"
+complete -f -c mix -n '__fish_mix_using_command help' -a do -d "Executes the tasks separated by comma"
+complete -f -c mix -n '__fish_mix_using_command help' -a escript.build -d "Builds an escript for the project"
+complete -f -c mix -n '__fish_mix_using_command help' -a help -d "Prints help information for tasks"
+complete -f -c mix -n '__fish_mix_using_command help' -a loadconfig -d "Loads and persists the given configuration"
+complete -f -c mix -n '__fish_mix_using_command help' -a local -d "Lists local tasks"
+complete -f -c mix -n '__fish_mix_using_command help' -a local.hex -d "Installs Hex locally"
 complete -f -c mix -n '__fish_mix_using_command help' -a local.public_keys -d "Manages public keys"
-complete -f -c mix -n '__fish_mix_using_command help' -a local.rebar       -d "Installs rebar locally"
-complete -f -c mix -n '__fish_mix_using_command help' -a new               -d "Creates a new Elixir project"
-complete -f -c mix -n '__fish_mix_using_command help' -a profile.fprof     -d "Profiles the given file or expression with fprof"
-complete -f -c mix -n '__fish_mix_using_command help' -a run               -d "Runs the given file or expression"
-complete -f -c mix -n '__fish_mix_using_command help' -a test              -d "Runs a project's tests"
+complete -f -c mix -n '__fish_mix_using_command help' -a local.rebar -d "Installs rebar locally"
+complete -f -c mix -n '__fish_mix_using_command help' -a new -d "Creates a new Elixir project"
+complete -f -c mix -n '__fish_mix_using_command help' -a profile.fprof -d "Profiles the given file or expression with fprof"
+complete -f -c mix -n '__fish_mix_using_command help' -a run -d "Runs the given file or expression"
+complete -f -c mix -n '__fish_mix_using_command help' -a test -d "Runs a project's tests"
diff --git a/share/completions/mkdir.fish b/share/completions/mkdir.fish
index 1e863244b..f33a69bca 100644
--- a/share/completions/mkdir.fish
+++ b/share/completions/mkdir.fish
@@ -1,6 +1,6 @@
 
 # Checks if we are using GNU tools
-if mkdir --version > /dev/null 2>/dev/null
+if mkdir --version >/dev/null 2>/dev/null
     complete -c mkdir -l version -d 'Output version'
     complete -c mkdir -s m -l mode -d 'Set file mode (as in chmod)' -x
     complete -c mkdir -s p -l parents -d 'Make parent directories as needed'
@@ -14,6 +14,6 @@ else
 end
 
 # Checks if SELinux is installed
-if command -s sestatus > /dev/null 2>/dev/null
+if command -s sestatus >/dev/null 2>/dev/null
     complete -c mkdir -l context -s Z -d 'Set SELinux security context of each created directory to the default type'
 end
diff --git a/share/completions/mktemp.fish b/share/completions/mktemp.fish
index 11dceb1a7..c7754f98f 100644
--- a/share/completions/mktemp.fish
+++ b/share/completions/mktemp.fish
@@ -1,14 +1,14 @@
 if mktemp --version >/dev/null 2>/dev/null # GNU
-	complete -c mktemp -s d -l directory    -d 'create a directory, not a file'
-	complete -c mktemp -s u -l dry-run      -d 'do not create anything; merely print a name (unsafe)'
-	complete -c mktemp -s q -l quiet        -d 'suppress diagnostics about file/dir-creation failure'
-	complete -c mktemp -l suffix -r         -d 'append SUFF to TEMPLATE'
-	complete -c mktemp -l tmpdir            -d 'interpret TEMPLATE relative to DIR'
-	complete -c mktemp -l help              -d 'display this help and exit'
-	complete -c mktemp -l version           -d 'output version information and exit'
+    complete -c mktemp -s d -l directory -d 'create a directory, not a file'
+    complete -c mktemp -s u -l dry-run -d 'do not create anything; merely print a name (unsafe)'
+    complete -c mktemp -s q -l quiet -d 'suppress diagnostics about file/dir-creation failure'
+    complete -c mktemp -l suffix -r -d 'append SUFF to TEMPLATE'
+    complete -c mktemp -l tmpdir -d 'interpret TEMPLATE relative to DIR'
+    complete -c mktemp -l help -d 'display this help and exit'
+    complete -c mktemp -l version -d 'output version information and exit'
 else # OS X
-	complete -c mktemp -s d                 -d 'create a directory, not a file'
-	complete -c mktemp -s q                 -d 'suppress diagnostics about file/dir-creation failure'
-	complete -c mktemp -s t -r              -d 'generate a template using PREFIX and TMPDIR (if set)'
-	complete -c mktemp -s u                 -d 'file will be unliked before mktemp exits (unsafe)'
+    complete -c mktemp -s d -d 'create a directory, not a file'
+    complete -c mktemp -s q -d 'suppress diagnostics about file/dir-creation failure'
+    complete -c mktemp -s t -r -d 'generate a template using PREFIX and TMPDIR (if set)'
+    complete -c mktemp -s u -d 'file will be unliked before mktemp exits (unsafe)'
 end
\ No newline at end of file
diff --git a/share/completions/mkvextract.fish b/share/completions/mkvextract.fish
index 89b0bb6fd..94a141420 100644
--- a/share/completions/mkvextract.fish
+++ b/share/completions/mkvextract.fish
@@ -17,10 +17,10 @@ function __fish_mkvextract_get_mode
             case tracks tags attachments chapters cuesheet timecodes_v2 cues
                 echo $c
                 return 0
-            # General flags that require an option - skip next argument
+                # General flags that require an option - skip next argument
             case --ui-language --command-line-charset --output-charset -r --redirect-output --ui-language --debug --engage
                 set skip_next 1
-            # If any of these flags are present, all other args are ignored
+                # If any of these flags are present, all other args are ignored
             case -h --help -V --version --check-for-updates
                 return 1
         end
@@ -46,10 +46,10 @@ function __fish_mkvextract_get_file
             # We've found the mode specifier, now look for the file
             case $mode
                 set mode_found 1
-            # Track-specific flags can appear between mode specifier and file
+                # Track-specific flags can appear between mode specifier and file
             case --ui-language --command-line-charset --output-charset -r --redirect-output --ui-language --debug --engage -c --blockadd --simple-language
                 set skip_next 1
-            # These flags now need to be explicitly skipped
+                # These flags now need to be explicitly skipped
             case -f --parse-fully -v --verbose -q --quiet '@*' --cuesheet --raw --fullraw -s --simple --gui-mode
                 continue
             case -h --help -V --version --check-for-updates
@@ -87,38 +87,38 @@ function __fish_mkvextract_print_tracks
 end
 
 # simple options
-complete -f -c mkvextract -s V -l 'version'           -d 'Show version information'
-complete -f -c mkvextract -s h -l 'help'              -d 'Show help'
-complete -f -c mkvextract      -l 'check-for-updates' -d 'Check online for updates'
+complete -f -c mkvextract -s V -l 'version' -d 'Show version information'
+complete -f -c mkvextract -s h -l 'help' -d 'Show help'
+complete -f -c mkvextract -l 'check-for-updates' -d 'Check online for updates'
 # extraction modes
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tracks'       -d 'Extract tracks to external files'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tags'         -d 'Extract tags as XML'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'attachments'  -d 'Extract attachments'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'chapters'     -d 'Extract chapters as XML'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cuesheet'     -d 'Extract chapters and tags as CUE sheet'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tracks' -d 'Extract tracks to external files'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'tags' -d 'Extract tags as XML'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'attachments' -d 'Extract attachments'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'chapters' -d 'Extract chapters as XML'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cuesheet' -d 'Extract chapters and tags as CUE sheet'
 complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'timecodes_v2' -d 'Extract timecodes of a track as timecode v2 file'
-complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cues'         -d 'Extract cue information as text file'
+complete -f -c mkvextract -n 'not __fish_mkvextract_get_mode' -a 'cues' -d 'Extract cue information as text file'
 # tracks/attachments when appropriate
 complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks timecodes_v2 cues' -a '(__fish_mkvextract_print_tracks)'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode attachments'              -a '(__fish_mkvextract_print_attachments)'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode attachments' -a '(__fish_mkvextract_print_attachments)'
 # these extraction modes have no parameters other than optional flags and the file
 complete -f -c mkvextract -n '__fish_mkvextract_using_mode tags chapters cuesheet'
 # general flags
-complete -c mkvextract    -s f -l 'parse-fully'          -d 'Parse the whole file instead of relying on the index'
-complete -c mkvextract    -s v -l 'verbose'              -d 'Increase verbosity'
-complete -c mkvextract    -s q -l 'quiet'                -d 'Suppress status output'
-complete -c mkvextract -r      -l 'ui-language'          -d 'Force a locale'
-complete -c mkvextract -r      -l 'command-line-charset' -d 'Charset for strings on the command line'
-complete -c mkvextract -r      -l 'output-charset'       -d 'Outputs messages in specified charset'
-complete -c mkvextract -r -s r -l 'redirect-output'      -d 'Redirect all messages into a file'
-complete -c mkvextract -r      -l 'debug'                -d 'Turn on debugging for a specific feature'
-complete -c mkvextract -r      -l 'engage'               -d 'Turn on an experimental feature'
-complete -c mkvextract         -l 'gui-mode'             -d 'Enable GUI mode'
+complete -c mkvextract -s f -l 'parse-fully' -d 'Parse the whole file instead of relying on the index'
+complete -c mkvextract -s v -l 'verbose' -d 'Increase verbosity'
+complete -c mkvextract -s q -l 'quiet' -d 'Suppress status output'
+complete -c mkvextract -r -l 'ui-language' -d 'Force a locale'
+complete -c mkvextract -r -l 'command-line-charset' -d 'Charset for strings on the command line'
+complete -c mkvextract -r -l 'output-charset' -d 'Outputs messages in specified charset'
+complete -c mkvextract -r -s r -l 'redirect-output' -d 'Redirect all messages into a file'
+complete -c mkvextract -r -l 'debug' -d 'Turn on debugging for a specific feature'
+complete -c mkvextract -r -l 'engage' -d 'Turn on an experimental feature'
+complete -c mkvextract -l 'gui-mode' -d 'Enable GUI mode'
 # mode-specific flags
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'   -r -s c                      -d 'Convert text subtitles to a charset'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'           -l 'cuesheet'        -d 'Also try to extract the CUE sheet'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'   -r      -l 'blockadd'        -d 'Keep only the BlockAdditions up to the specified level'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'           -l 'raw'             -d 'Extract the data to a raw file'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks'           -l 'fullraw'         -d 'Extract the data to a raw file including the CodecPrivate as header'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters'    -s s -l 'simple'          -d 'Exports the chapter information in a simple format'
-complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -r      -l 'simple-language' -d 'Uses the chapter names of the specified language'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -r -s c -d 'Convert text subtitles to a charset'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l 'cuesheet' -d 'Also try to extract the CUE sheet'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -r -l 'blockadd' -d 'Keep only the BlockAdditions up to the specified level'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l 'raw' -d 'Extract the data to a raw file'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode tracks' -l 'fullraw' -d 'Extract the data to a raw file including the CodecPrivate as header'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -s s -l 'simple' -d 'Exports the chapter information in a simple format'
+complete -f -c mkvextract -n '__fish_mkvextract_using_mode chapters' -r -l 'simple-language' -d 'Uses the chapter names of the specified language'
diff --git a/share/completions/mocha.fish b/share/completions/mocha.fish
index 72e91d077..221ac3483 100644
--- a/share/completions/mocha.fish
+++ b/share/completions/mocha.fish
@@ -1,47 +1,47 @@
 complete -c mocha -l help -o help -s h -d "Show help"
-complete -c mocha -s V -l version          -d "output the version number"
-complete -c mocha -s A -l async-only       -d "force all tests to take a callback (async) or return a promise"
-complete -c mocha -s c -l colors           -d "force enabling of colors"
-complete -c mocha -s C -l no-colors        -d "force disabling of colors"
-complete -c mocha -s G -l growl            -d "enable growl notification support"
+complete -c mocha -s V -l version -d "output the version number"
+complete -c mocha -s A -l async-only -d "force all tests to take a callback (async) or return a promise"
+complete -c mocha -s c -l colors -d "force enabling of colors"
+complete -c mocha -s C -l no-colors -d "force disabling of colors"
+complete -c mocha -s G -l growl -d "enable growl notification support"
 complete -c mocha -s O -l reporter-options -d "<k=v,k2=v2,...>  reporter-specific options"
-complete -c mocha -s R -l reporter -x      -d "specify the reporter to use"
-complete -c mocha -s S -l sort             -d "sort test files"
-complete -c mocha -s b -l bail             -d "bail after first test failure"
-complete -c mocha -s d -l debug            -d "enable node\'s debugger, synonym for node --debug"
-complete -c mocha -s g -l grep -x          -d "only run tests matching <pattern>"
-complete -c mocha -s f -l fgrep -x         -d "only run tests containing <string>"
-complete -c mocha -s g -l expose-gc        -d "expose gc extension"
-complete -c mocha -s i -l invert           -d "inverts --grep and --fgrep matches"
-complete -c mocha -s r -l require -r       -d "require the given module"
-complete -c mocha -s s -l slow -x          -d "\"slow\" test threshold in milliseconds [75]"
-complete -c mocha -s t -l timeout -x       -d "set test-case timeout in milliseconds [2000]"
-complete -c mocha -s u -l ui -x            -d "specify user-interface (bdd|tdd|qunit|exports)"
-complete -c mocha -s w -l watch            -d "watch files for changes"
-complete -c mocha -l check-leaks           -d "check for global variable leaks"
-complete -c mocha -l full-trace            -d "display the full stack trace"
-complete -c mocha -l compilers -x          -d "use the given module(s) to compile files"
-complete -c mocha -l debug-brk             -d "enable node\'s debugger breaking on thefirst line"
-complete -c mocha -l globals -x            -d "allow the given comma-delimited global[names]"
-complete -c mocha -l es_staging            -d "enable all staged features"
-complete -c mocha -l harmony               -d "all node --harmony* flags are available"
-complete -c mocha -l preserve-symlinks     -d "Instructs the module loader to preserve symbolic links when resolving and caching modules"
-complete -c mocha -l icu-data-dir          -d "include ICU data"
-complete -c mocha -l inline-diffs          -d "display actual/expected differences inline within each string"
-complete -c mocha -l interfaces            -d "display available interfaces"
-complete -c mocha -l no-deprecation        -d "silence deprecation warnings"
-complete -c mocha -l no-exit               -d "require a clean shutdown of the event loop: mocha will not call process.exit"
-complete -c mocha -l no-timeouts           -d "disables timeouts, given implicitly with --debug"
-complete -c mocha -l opts                  -d "specify opts path"
-complete -c mocha -l perf-basic-prof       -d "enable perf linux profiler (basic support)"
-complete -c mocha -l prof                  -d "log statistical profiling information"
-complete -c mocha -l log-timer-events      -d "Time events including external callbacks"
-complete -c mocha -l recursive             -d "include sub directories"
-complete -c mocha -l reporters             -d "display available reporters"
-complete -c mocha -l retries               -d "set numbers of time to retry a failed test case"
-complete -c mocha -l throw-deprecation     -d "throw an exception anytime a deprecated function is used"
-complete -c mocha -l trace                 -d "trace function calls"
-complete -c mocha -l trace-deprecation     -d "show stack traces on deprecations"
-complete -c mocha -l use_strict            -d "enforce strict mode"
-complete -c mocha -l watch-extensions      -d "additional extensions to monitor with --watch"
-complete -c mocha -l delay                 -d "wait for async suite definition"
+complete -c mocha -s R -l reporter -x -d "specify the reporter to use"
+complete -c mocha -s S -l sort -d "sort test files"
+complete -c mocha -s b -l bail -d "bail after first test failure"
+complete -c mocha -s d -l debug -d "enable node\'s debugger, synonym for node --debug"
+complete -c mocha -s g -l grep -x -d "only run tests matching <pattern>"
+complete -c mocha -s f -l fgrep -x -d "only run tests containing <string>"
+complete -c mocha -s g -l expose-gc -d "expose gc extension"
+complete -c mocha -s i -l invert -d "inverts --grep and --fgrep matches"
+complete -c mocha -s r -l require -r -d "require the given module"
+complete -c mocha -s s -l slow -x -d "\"slow\" test threshold in milliseconds [75]"
+complete -c mocha -s t -l timeout -x -d "set test-case timeout in milliseconds [2000]"
+complete -c mocha -s u -l ui -x -d "specify user-interface (bdd|tdd|qunit|exports)"
+complete -c mocha -s w -l watch -d "watch files for changes"
+complete -c mocha -l check-leaks -d "check for global variable leaks"
+complete -c mocha -l full-trace -d "display the full stack trace"
+complete -c mocha -l compilers -x -d "use the given module(s) to compile files"
+complete -c mocha -l debug-brk -d "enable node\'s debugger breaking on thefirst line"
+complete -c mocha -l globals -x -d "allow the given comma-delimited global[names]"
+complete -c mocha -l es_staging -d "enable all staged features"
+complete -c mocha -l harmony -d "all node --harmony* flags are available"
+complete -c mocha -l preserve-symlinks -d "Instructs the module loader to preserve symbolic links when resolving and caching modules"
+complete -c mocha -l icu-data-dir -d "include ICU data"
+complete -c mocha -l inline-diffs -d "display actual/expected differences inline within each string"
+complete -c mocha -l interfaces -d "display available interfaces"
+complete -c mocha -l no-deprecation -d "silence deprecation warnings"
+complete -c mocha -l no-exit -d "require a clean shutdown of the event loop: mocha will not call process.exit"
+complete -c mocha -l no-timeouts -d "disables timeouts, given implicitly with --debug"
+complete -c mocha -l opts -d "specify opts path"
+complete -c mocha -l perf-basic-prof -d "enable perf linux profiler (basic support)"
+complete -c mocha -l prof -d "log statistical profiling information"
+complete -c mocha -l log-timer-events -d "Time events including external callbacks"
+complete -c mocha -l recursive -d "include sub directories"
+complete -c mocha -l reporters -d "display available reporters"
+complete -c mocha -l retries -d "set numbers of time to retry a failed test case"
+complete -c mocha -l throw-deprecation -d "throw an exception anytime a deprecated function is used"
+complete -c mocha -l trace -d "trace function calls"
+complete -c mocha -l trace-deprecation -d "show stack traces on deprecations"
+complete -c mocha -l use_strict -d "enforce strict mode"
+complete -c mocha -l watch-extensions -d "additional extensions to monitor with --watch"
+complete -c mocha -l delay -d "wait for async suite definition"
diff --git a/share/completions/mocp.fish b/share/completions/mocp.fish
index 19020abf2..cfb3b45da 100644
--- a/share/completions/mocp.fish
+++ b/share/completions/mocp.fish
@@ -1,35 +1,35 @@
-complete -c mocp -s V -l version            -d "Print program version and exit"
-complete -c mocp -s h -l help               -d "Print usage and exit"
-complete -c mocp -s D -l debug              -d "Turn on logging to a file"
-complete -c mocp -s S -l server             -d "Run only the server"
-complete -c mocp -s F -l foreground         -d "Run server in foreground, log to stdout"
-complete -c mocp -s R -l sound-driver       -d "Use the specified sound driver" -xa 'oss alsa jack null'
-complete -c mocp -s m -l music-dir -r       -d "Start in MusicDir"
-complete -c mocp -s a -l append   -r        -d "Append the files/directories/playlists passed in the command line to playlist and exit"
-complete -c mocp -s q -l enqueue  -r        -d "Add the files given on command line to the queue"
-complete -c mocp -s c -l clear              -d "Clear the playlist and exit"
-complete -c mocp -s p -l play     -r        -d "Start playing from the first item on the playlist"
-complete -c mocp -s l -l playit   -r        -d "Play files given on command line without modifying the playlist"
-complete -c mocp -s s -l stop               -d "Stop playing"
-complete -c mocp -s f -l next               -d "Play next song"
-complete -c mocp -s r -l previous           -d "Play previous song"
-complete -c mocp -s x -l exit               -d "Shutdown the server"
-complete -c mocp -s T -l theme    -r        -d "Use selected theme file (read from ~/.moc/themes if the path is not absolute"
-complete -c mocp -s C -l config   -r        -d "Use the specified config file instead of the default"
-complete -c mocp -s O -l set-option -r      -d "NAME=VALUE Override configuration option NAME with VALUE"
-complete -c mocp -s M -l moc-dir    -r      -d "Use the specified MOC directory instead of the default"
-complete -c mocp -s P -l pause              -d "Pause"
-complete -c mocp -s U -l unpause            -d "Unpause"
-complete -c mocp -s G -l toggle-pause       -d "Toggle between play/pause"
-complete -c mocp -s v -l volume             -d "(+/-)LEVEL Adjust PCM volume" -xa '+ -'
-complete -c mocp -s y -l sync               -d "Synchronize the playlist with other clients"
-complete -c mocp -s n -l nosync             -d "Don't synchronize the playlist with other client's"
-complete -c mocp -s A -l ascii              -d "Use ASCII characters to draw lines"
-complete -c mocp -s i -l info               -d "Print the information about the currently played file"
-complete -c mocp -s Q -l format  -rf        -d "Print the formatted information about the currently played file"
-complete -c mocp -s e -l recursively        -d "Alias for -a"
-complete -c mocp -s k -l seek  -rf          -d "Seek by N seconds (can be negative)"
-complete -c mocp -s j -l jump  -rf          -d "N{%,s} Jump to some position of the current track"
-complete -c mocp -s o -l on                 -d "Turn on a control" -xa 'shuffle autonext repeat'
-complete -c mocp -s u -l off                -d "Turn off a control" -xa 'shuffle autonext repeat'
-complete -c mocp -s t -l toggle             -d "Toggle a control" -xa '(__fish_complete_list , "echo shuffle\nautonext\nrepeat\ns\tshuffle\nr\trepeat\nn\tautonext")'
+complete -c mocp -s V -l version -d "Print program version and exit"
+complete -c mocp -s h -l help -d "Print usage and exit"
+complete -c mocp -s D -l debug -d "Turn on logging to a file"
+complete -c mocp -s S -l server -d "Run only the server"
+complete -c mocp -s F -l foreground -d "Run server in foreground, log to stdout"
+complete -c mocp -s R -l sound-driver -d "Use the specified sound driver" -xa 'oss alsa jack null'
+complete -c mocp -s m -l music-dir -r -d "Start in MusicDir"
+complete -c mocp -s a -l append -r -d "Append the files/directories/playlists passed in the command line to playlist and exit"
+complete -c mocp -s q -l enqueue -r -d "Add the files given on command line to the queue"
+complete -c mocp -s c -l clear -d "Clear the playlist and exit"
+complete -c mocp -s p -l play -r -d "Start playing from the first item on the playlist"
+complete -c mocp -s l -l playit -r -d "Play files given on command line without modifying the playlist"
+complete -c mocp -s s -l stop -d "Stop playing"
+complete -c mocp -s f -l next -d "Play next song"
+complete -c mocp -s r -l previous -d "Play previous song"
+complete -c mocp -s x -l exit -d "Shutdown the server"
+complete -c mocp -s T -l theme -r -d "Use selected theme file (read from ~/.moc/themes if the path is not absolute"
+complete -c mocp -s C -l config -r -d "Use the specified config file instead of the default"
+complete -c mocp -s O -l set-option -r -d "NAME=VALUE Override configuration option NAME with VALUE"
+complete -c mocp -s M -l moc-dir -r -d "Use the specified MOC directory instead of the default"
+complete -c mocp -s P -l pause -d "Pause"
+complete -c mocp -s U -l unpause -d "Unpause"
+complete -c mocp -s G -l toggle-pause -d "Toggle between play/pause"
+complete -c mocp -s v -l volume -d "(+/-)LEVEL Adjust PCM volume" -xa '+ -'
+complete -c mocp -s y -l sync -d "Synchronize the playlist with other clients"
+complete -c mocp -s n -l nosync -d "Don't synchronize the playlist with other client's"
+complete -c mocp -s A -l ascii -d "Use ASCII characters to draw lines"
+complete -c mocp -s i -l info -d "Print the information about the currently played file"
+complete -c mocp -s Q -l format -rf -d "Print the formatted information about the currently played file"
+complete -c mocp -s e -l recursively -d "Alias for -a"
+complete -c mocp -s k -l seek -rf -d "Seek by N seconds (can be negative)"
+complete -c mocp -s j -l jump -rf -d "N{%,s} Jump to some position of the current track"
+complete -c mocp -s o -l on -d "Turn on a control" -xa 'shuffle autonext repeat'
+complete -c mocp -s u -l off -d "Turn off a control" -xa 'shuffle autonext repeat'
+complete -c mocp -s t -l toggle -d "Toggle a control" -xa '(__fish_complete_list , "echo shuffle\nautonext\nrepeat\ns\tshuffle\nr\trepeat\nn\tautonext")'
diff --git a/share/completions/mogrify.fish b/share/completions/mogrify.fish
index b9a5f0a20..aec69c942 100644
--- a/share/completions/mogrify.fish
+++ b/share/completions/mogrify.fish
@@ -1,212 +1,212 @@
-complete -c mogrify -o adjoin                       -d 'Join images into a single multi-image file'
-complete -c mogrify -o affine                       -d 'Affine transform matrix [matrix]'
-complete -c mogrify -o antialias                    -d 'Remove pixel-aliasing '
-complete -c mogrify -o authenticate                 -d 'Decrypt image with this password [value]'
-complete -c mogrify -o background                   -d 'Background color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o bias                         -d 'Add bias when convolving an image [value]'
-complete -c mogrify -o black-point-compensation     -d 'Use black point compensation'
-complete -c mogrify -o blue-primary                 -d 'Chromaticity blue primary point [point]'
-complete -c mogrify -o bordercolor                  -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o caption                      -d 'Assign a caption to an image [string]'
-complete -c mogrify -o cdl                          -d 'Color correct with a color decision list [filename]' -r
-complete -c mogrify -o channel                      -d 'Apply option to select image channels [type]' -xa '(mogrify -list channel)'
-complete -c mogrify -o colors                       -d 'Preferred number of colors in the image [value]'
-complete -c mogrify -o colorspace                   -d 'Alternate image colorspace [type]' -xa '(mogrify -list colorspace)'
-complete -c mogrify -o comment                      -d 'Annotate image with comment [string]'
-complete -c mogrify -o compose                      -d 'Set image composite operator [operator]'
-complete -c mogrify -o compress                     -d 'Type of pixel compression when writing the image [type]' -xa '(mogrify -list compress)'
-complete -c mogrify -o decipher                     -d 'Convert cipher pixels to plain pixels [filename]' -r
-complete -c mogrify -o define                       -d 'Define one or more image format options [format:option]'
-complete -c mogrify -o delay                        -d 'Display the next image after pausing [value]'
-complete -c mogrify -o density                      -d 'Horizontal and vertical density of the image [geometry]'
-complete -c mogrify -o depth                        -d 'Image depth [value]'
-complete -c mogrify -o direction                    -d 'Render text right-to-left or left-to-right [type]' -xa '(mogrify -list direction)'
-complete -c mogrify -o display                      -d 'Get image or font from this X server [server]'
-complete -c mogrify -o dispose                      -d 'Layer disposal method [method]' -xa '(mogrify -list dispose)'
-complete -c mogrify -o dither                       -d 'Apply error diffusion to image [method]' -xa '(mogrify -list dither)'
-complete -c mogrify -o encipher                     -d 'Convert plain pixels to cipher pixels [filename]' -r
-complete -c mogrify -o encoding                     -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c mogrify -o endian                       -d 'Endianness (MSB or LSB) of the image [type]' -xa '(mogrify -list endian)'
-complete -c mogrify -o family                       -d 'Render text with this font family [name]' -xa '(__fish_complete_convert_options family)'
-complete -c mogrify -o fill                         -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o filter                       -d 'Use this filter when resizing an image [type]' -xa '(mogrify -list filter)'
-complete -c mogrify -o flatten                      -d 'Flatten a sequence of images'
-complete -c mogrify -o font                         -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
-complete -c mogrify -o format                       -d 'Image format type [type]' -xa '(__fish_complete_convert_options type)'
-complete -c mogrify -o function                     -d 'Apply a function to the image [name]' -xa '(mogrify -list function)'
-complete -c mogrify -o fuzz                         -d 'Colors within this distance are considered equal [distance]'
-complete -c mogrify -o gravity                      -d 'Horizontal and vertical text placement [type]' -xa '(mogrify -list gravity)'
-complete -c mogrify -o green-primary                -d 'Chromaticity green primary point [point]'
-complete -c mogrify -o intent                       -d 'Type of rendering intent when managing the image color [type]' -xa '(mogrify -list intent)'
-complete -c mogrify -o interlace                    -d 'Type of image interlacing scheme [type]' -xa '(mogrify -list interlace)'
-complete -c mogrify -o interpolate                  -d 'Pixel color interpolation method [method]' -xa '(mogrify -list interpolate)'
-complete -c mogrify -o kerning                      -d 'Set the space between two letters [value]'
-complete -c mogrify -o label                        -d 'Assign a label to an image [string]'
-complete -c mogrify -o limit                        -d 'Pixel cache resource limit [type value]' -x
-complete -c mogrify -o loop                         -d 'Add Netscape loop extension to your GIF animation [iterations]'
-complete -c mogrify -o mask                         -d 'Associate a mask with the image [filename]' -r
-complete -c mogrify -o matte                        -d 'Store matte channel if the image has one'
-complete -c mogrify -o mattecolor                   -d 'Frame color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o monitor                      -d 'Monitor progress '
-complete -c mogrify -o morphology                   -d 'Apply a morphology method to the image [method kernel]' -xa '(mogrify -list morphology)'
-complete -c mogrify -o orient                       -d 'Image orientation [type]' -xa '(mogrify -list orientation)'
-complete -c mogrify -o origin                       -d 'Image origin [geometry]'
-complete -c mogrify -o page                         -d 'Size and location of an image canvas (setting) [geometry]'
-complete -c mogrify -o path                         -d 'Path write images to this path on disk'
-complete -c mogrify -o ping                         -d 'Efficiently determine image attributes'
-complete -c mogrify -o pointsize                    -d 'Font point size [value]'
-complete -c mogrify -o preview                      -d 'Image preview type [type]' -xa '(mogrify -list preview)'
-complete -c mogrify -o quality                      -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c mogrify -o quiet                        -d 'Suppress all warning messages'
-complete -c mogrify -o red-primary                  -d 'Chromaticity red primary point [point]'
-complete -c mogrify -o regard-warnings              -d 'Pay attention to warning messages'
-complete -c mogrify -o sampling-factor              -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c mogrify -o scene                        -d 'Image scene number [value]'
-complete -c mogrify -o seed                         -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c mogrify -o size                         -d 'Width and height of image [geometry]'
-complete -c mogrify -o stretch                      -d 'Render text with this font stretch [type]' -xa '(mogrify -list stretch)'
-complete -c mogrify -o stroke                       -d 'Graphic primitive stroke color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o strokewidth                  -d 'Graphic primitive stroke width [value]'
-complete -c mogrify -o style                        -d 'Render text with this font style [type]' -xa '(mogrify -list style)'
-complete -c mogrify -o support                      -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
-complete -c mogrify -o synchronize                  -d 'Synchronize image to storage device'
-complete -c mogrify -o taint                        -d 'Declare the image as modified'
-complete -c mogrify -o texture                      -d 'Name of texture to tile onto the image background [filename]' -r
-complete -c mogrify -o tile-offset                  -d 'Tile offset [geometry]'
-complete -c mogrify -o treedepth                    -d 'Color tree depth [value]'
-complete -c mogrify -o transparent-color            -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o undercolor                   -d 'Annotation bounding box color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o units                        -d 'The units of image resolution [type]' -xa '(mogrify -list units)'
-complete -c mogrify -o verbose                      -d 'Print detailed information about the image'
-complete -c mogrify -o view                         -d 'FlashPix viewing transforms'
-complete -c mogrify -o virtual-pixel                -d 'Virtual pixel access method [method]' -xa '(mogrify -list virtual-pixel)'
-complete -c mogrify -o weight                       -d 'Render text with this font weight [type]' -x
-complete -c mogrify -o white-point                  -d 'Chromaticity white point [point]'
-complete -c mogrify -o adaptive-blur                -d 'Adaptively blur pixels; decrease effect near edges [geometry]'
-complete -c mogrify -o adaptive-resize              -d 'Adaptively resize image with data dependent triangulation [geometry]'
-complete -c mogrify -o adaptive-sharpen             -d 'Adaptively sharpen pixels; increase effect near edges [geometry]'
-complete -c mogrify -o annotate                     -d 'Annotate the image with text [geometry text]'
-complete -c mogrify -o auto-orient                  -d 'Automatically orient image'
-complete -c mogrify -o black-threshold              -d 'Force all pixels below the threshold into black [value]'
-complete -c mogrify -o blur                         -d 'Reduce image noise and reduce detail levels [geometry]'
-complete -c mogrify -o border                       -d 'Surround image with a border of color [geometry]'
-complete -c mogrify -o charcoal                     -d 'Simulate a charcoal drawing [radius]'
-complete -c mogrify -o chop                         -d 'Remove pixels from the image interior [geometry]'
-complete -c mogrify -o clip                         -d 'Clip along the first path from the 8BIM profile'
-complete -c mogrify -o clip-mask                    -d 'Associate a clip mask with the image [filename]' -r
-complete -c mogrify -o clip-path                    -d 'Clip along a named path from the 8BIM profile [id]'
-complete -c mogrify -o colorize                     -d 'Colorize the image with the fill color [value]'
-complete -c mogrify -o color-matrix                 -d 'Apply color correction to the image [matrix]'
-complete -c mogrify -o contrast                     -d 'Enhance or reduce the image contrast'
-complete -c mogrify -o contrast-stretch             -d 'Improve contrast by `stretching\' the intensity range [geometry]'
-complete -c mogrify -o convolve                     -d 'Apply a convolution kernel to the image [coefficients]'
-complete -c mogrify -o cycle                        -d 'Cycle the image colormap [amount]'
-complete -c mogrify -o despeckle                    -d 'Reduce the speckles within an image'
-complete -c mogrify -o draw                         -d 'Annotate the image with a graphic primitive [string]'
-complete -c mogrify -o edge                         -d 'Apply a filter to detect edges in the image [radius]'
-complete -c mogrify -o emboss                       -d 'Emboss an image [radius]'
-complete -c mogrify -o enhance                      -d 'Apply a digital filter to enhance a noisy image'
-complete -c mogrify -o equalize                     -d 'Perform histogram equalization to an image'
-complete -c mogrify -o evaluate                     -d 'Evaluate an arithmetic, relational, or logical expression [operator value]'
-complete -c mogrify -o extent                       -d 'Set the image size [geometry]'
-complete -c mogrify -o extract                      -d 'Extract area from image [geometry]'
-complete -c mogrify -o fft                          -d 'Implements the discrete Fourier transform (DFT)'
-complete -c mogrify -o flip                         -d 'Flip image vertically'
-complete -c mogrify -o floodfill                    -d 'Color floodfill the image with color [geometry]'
-complete -c mogrify -o flop                         -d 'Flop image horizontally'
-complete -c mogrify -o frame                        -d 'Surround image with an ornamental border [geometry]'
-complete -c mogrify -o gamma                        -d 'Level of gamma correction [value]'
-complete -c mogrify -o gaussian-blur                -d 'Reduce image noise and reduce detail levels [geometry]'
-complete -c mogrify -o geometry                     -d 'Preferred size or location of the image [geometry]'
-complete -c mogrify -o ift                          -d 'Implements the inverse discrete Fourier transform (DFT)'
-complete -c mogrify -o help                         -d 'Print program options'
-complete -c mogrify -o identify                     -d 'Identify the format and characteristics of the image'
-complete -c mogrify -o implode                      -d 'Implode image pixels about the center [amount]'
-complete -c mogrify -o lat                          -d 'Local adaptive thresholding [geometry]'
-complete -c mogrify -o layers                       -d 'Optimize or compare image layers [method]' -xa '(mogrify -list layers)'
-complete -c mogrify -o level                        -d 'Adjust the level of image contrast [value]'
-complete -c mogrify -o linear-stretch               -d 'Improve contrast by `stretching with saturation\' the intensity range [geometry]'
-complete -c mogrify -o median                       -d 'Apply a median filter to the image [geometry]'
-complete -c mogrify -o mode                         -d 'Make each pixel the \'predominant color\' of the neighborhood [geometry]'
-complete -c mogrify -o modulate                     -d 'Vary the brightness, saturation, and hue [value]'
-complete -c mogrify -o monochrome                   -d 'Transform image to black and white'
-complete -c mogrify -o motion-blur                  -d 'Simulate motion blur [geometry]'
-complete -c mogrify -o negate                       -d 'Replace each pixel with its complementary color'
-complete -c mogrify -o noise                        -d 'Add or reduce noise in an image [geometry]'
-complete -c mogrify -o normalize                    -d 'Transform image to span the full range of colors'
-complete -c mogrify -o opaque                       -d 'Change this color to the fill color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o ordered-dither               -d 'Add a noise pattern to the image with specific amplitudes [NxN]'
-complete -c mogrify -o paint                        -d 'Simulate an oil painting [radius]'
-complete -c mogrify -o polaroid                     -d 'Simulate a Polaroid picture [angle]'
-complete -c mogrify -o posterize                    -d 'Reduce the image to a limited number of color levels [levels]'
-complete -c mogrify -o print                        -d 'Interpret string and print to console [string]'
-complete -c mogrify -o profile                      -d 'Add, delete, or apply an image profile [filename]' -r
-complete -c mogrify -o quantize                     -d 'Reduce colors in this colorspace [colorspace]' -xa '(mogrify -list colorspace)'
-complete -c mogrify -o radial-blur                  -d 'Radial blur the image [angle]'
-complete -c mogrify -o raise                        -d 'Lighten/darken image edges to create a 3-D effect [value]'
-complete -c mogrify -o random-threshold             -d 'Random threshold the image [low,high]'
-complete -c mogrify -o region                       -d 'Apply options to a portion of the image [geometry]'
-complete -c mogrify -o render                       -d 'Render vector graphics'
-complete -c mogrify -o repage                       -d 'Size and location of an image canvas [geometry]'
-complete -c mogrify -o resample                     -d 'Change the resolution of an image [geometry]'
-complete -c mogrify -o resize                       -d 'Resize the image [geometry]'
-complete -c mogrify -o roll                         -d 'Roll an image vertically or horizontally [geometry]'
-complete -c mogrify -o rotate                       -d 'Apply Paeth rotation to the image [degrees]'
-complete -c mogrify -o sample                       -d 'Scale image with pixel sampling [geometry]'
-complete -c mogrify -o scale                        -d 'Scale the image [geometry]'
-complete -c mogrify -o segment                      -d 'Segment an image [values]'
-complete -c mogrify -o selective-blur               -d 'Selectively blur pixels within a contrast threshold [geometry]'
-complete -c mogrify -o sepia-tone                   -d 'Simulate a sepia-toned photo [threshold]'
-complete -c mogrify -o set                          -d 'Set an image property [property value]'
-complete -c mogrify -o shade                        -d 'Shade the image using a distant light source [degrees]'
-complete -c mogrify -o shadow                       -d 'Simulate an image shadow [geometry]'
-complete -c mogrify -o sharpen                      -d 'Sharpen the image [geometry]'
-complete -c mogrify -o shave                        -d 'Shave pixels from the image edges [geometry]'
-complete -c mogrify -o shear                        -d 'Slide one edge of the image along the X or Y axis [geometry]'
-complete -c mogrify -o sigmoidal-contrast           -d 'Lightness rescaling using sigmoidal contrast enhancement [geometry]'
-complete -c mogrify -o sketch                       -d 'Simulate a pencil sketch [geometry]'
-complete -c mogrify -o solarize                     -d 'Negate all pixels above the threshold level [threshold]'
-complete -c mogrify -o splice                       -d 'Splice the background color into the image [geometry]'
-complete -c mogrify -o spread                       -d 'Displace image pixels by a random amount [amount]'
-complete -c mogrify -o statistic                    -d 'Replace each pixel with corresponding statistic from the neighborhood [type geometry]' -xa '(mogrify -list statistic)'
-complete -c mogrify -o strip                        -d 'Strip image of all profiles and comments'
-complete -c mogrify -o swirl                        -d 'Swirl image pixels about the center [degrees]'
-complete -c mogrify -o threshold                    -d 'Threshold the image [value]'
-complete -c mogrify -o thumbnail                    -d 'Create a thumbnail of the image [geometry]'
-complete -c mogrify -o tile                         -d 'Tile image when filling a graphic primitive [filename]' -r
-complete -c mogrify -o tint                         -d 'Tint the image with the fill color [value]'
-complete -c mogrify -o transform                    -d 'Affine transform image'
-complete -c mogrify -o transparent                  -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
-complete -c mogrify -o transpose                    -d 'Flip image vertically and rotate 90 degrees'
-complete -c mogrify -o transverse                   -d 'Flop image horizontally and rotate 270 degrees'
-complete -c mogrify -o trim                         -d 'Trim image edges'
-complete -c mogrify -o type                         -d 'Image type [type]' -xa '(mogrify -list type)'
-complete -c mogrify -o unique-colors                -d 'Discard all but one of any pixel color'
-complete -c mogrify -o unsharp                      -d 'Sharpen the image [geometry]'
-complete -c mogrify -o vignette                     -d 'Soften the edges of the image in vignette style [geometry]'
-complete -c mogrify -o wave                         -d 'Alter an image along a sine wave [geometry]'
-complete -c mogrify -o white-threshold              -d 'Force all pixels above the threshold into white [value]'
-complete -c mogrify -o affinity                     -d 'Transform image colors to match this set of colors [filename]' -r
-complete -c mogrify -o append                       -d 'Append an image sequence top to botto (use +append for left to right)'
-complete -c mogrify -o clut                         -d 'Apply a color lookup table to the image'
-complete -c mogrify -o coalesce                     -d 'Merge a sequence of images'
-complete -c mogrify -o combine                      -d 'Combine a sequence of images'
-complete -c mogrify -o composite                    -d 'Composite image '
-complete -c mogrify -o crop                         -d 'Cut out a rectangular region of the image [geometry]'
-complete -c mogrify -o deconstruct                  -d 'Break down an image sequence into constituent parts'
-complete -c mogrify -o evaluate-sequence            -d 'Evaluate an arithmetic, relational, or logical expression [operator]'
-complete -c mogrify -o fx                           -d 'Apply mathematical expression to an image channel(s) [expression]'
-complete -c mogrify -o hald-clut                    -d 'Apply a Hald color lookup table to the image'
-complete -c mogrify -o morph                        -d 'Morph an image sequence [value]'
-complete -c mogrify -o mosaic                       -d 'Create a mosaic from an image sequence'
-complete -c mogrify -o process                      -d 'Process the image with a custom image filter [arguments]' -xa '(mogrify -list filter)'
-complete -c mogrify -o separate                     -d 'Separate an image channel into a grayscale image'
-complete -c mogrify -o smush                        -d 'Smush an image sequence together [geometry]'
-complete -c mogrify -o write                        -d 'Write images to this file [filename]' -r
-complete -c mogrify -o delete                       -d 'Delete the image from the image sequence [indexes]'
-complete -c mogrify -o duplicate                    -d 'Duplicate an image one or more times [count,indexes]'
-complete -c mogrify -o insert                       -d 'Insert last image into the image sequence [index]'
-complete -c mogrify -o swap                         -d 'Swap two images in the image sequence [indexes]'
-complete -c mogrify -o debug                        -d 'Display copious debugging information [events]' -xa '(mogrify -list debug)'
-complete -c mogrify -o log                          -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c mogrify -o list                         -d 'Print a list of supported option arguments [type]' -xa '(mogrify -list list)'
+complete -c mogrify -o adjoin -d 'Join images into a single multi-image file'
+complete -c mogrify -o affine -d 'Affine transform matrix [matrix]'
+complete -c mogrify -o antialias -d 'Remove pixel-aliasing '
+complete -c mogrify -o authenticate -d 'Decrypt image with this password [value]'
+complete -c mogrify -o background -d 'Background color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o bias -d 'Add bias when convolving an image [value]'
+complete -c mogrify -o black-point-compensation -d 'Use black point compensation'
+complete -c mogrify -o blue-primary -d 'Chromaticity blue primary point [point]'
+complete -c mogrify -o bordercolor -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o caption -d 'Assign a caption to an image [string]'
+complete -c mogrify -o cdl -d 'Color correct with a color decision list [filename]' -r
+complete -c mogrify -o channel -d 'Apply option to select image channels [type]' -xa '(mogrify -list channel)'
+complete -c mogrify -o colors -d 'Preferred number of colors in the image [value]'
+complete -c mogrify -o colorspace -d 'Alternate image colorspace [type]' -xa '(mogrify -list colorspace)'
+complete -c mogrify -o comment -d 'Annotate image with comment [string]'
+complete -c mogrify -o compose -d 'Set image composite operator [operator]'
+complete -c mogrify -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(mogrify -list compress)'
+complete -c mogrify -o decipher -d 'Convert cipher pixels to plain pixels [filename]' -r
+complete -c mogrify -o define -d 'Define one or more image format options [format:option]'
+complete -c mogrify -o delay -d 'Display the next image after pausing [value]'
+complete -c mogrify -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c mogrify -o depth -d 'Image depth [value]'
+complete -c mogrify -o direction -d 'Render text right-to-left or left-to-right [type]' -xa '(mogrify -list direction)'
+complete -c mogrify -o display -d 'Get image or font from this X server [server]'
+complete -c mogrify -o dispose -d 'Layer disposal method [method]' -xa '(mogrify -list dispose)'
+complete -c mogrify -o dither -d 'Apply error diffusion to image [method]' -xa '(mogrify -list dither)'
+complete -c mogrify -o encipher -d 'Convert plain pixels to cipher pixels [filename]' -r
+complete -c mogrify -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c mogrify -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(mogrify -list endian)'
+complete -c mogrify -o family -d 'Render text with this font family [name]' -xa '(__fish_complete_convert_options family)'
+complete -c mogrify -o fill -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o filter -d 'Use this filter when resizing an image [type]' -xa '(mogrify -list filter)'
+complete -c mogrify -o flatten -d 'Flatten a sequence of images'
+complete -c mogrify -o font -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
+complete -c mogrify -o format -d 'Image format type [type]' -xa '(__fish_complete_convert_options type)'
+complete -c mogrify -o function -d 'Apply a function to the image [name]' -xa '(mogrify -list function)'
+complete -c mogrify -o fuzz -d 'Colors within this distance are considered equal [distance]'
+complete -c mogrify -o gravity -d 'Horizontal and vertical text placement [type]' -xa '(mogrify -list gravity)'
+complete -c mogrify -o green-primary -d 'Chromaticity green primary point [point]'
+complete -c mogrify -o intent -d 'Type of rendering intent when managing the image color [type]' -xa '(mogrify -list intent)'
+complete -c mogrify -o interlace -d 'Type of image interlacing scheme [type]' -xa '(mogrify -list interlace)'
+complete -c mogrify -o interpolate -d 'Pixel color interpolation method [method]' -xa '(mogrify -list interpolate)'
+complete -c mogrify -o kerning -d 'Set the space between two letters [value]'
+complete -c mogrify -o label -d 'Assign a label to an image [string]'
+complete -c mogrify -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c mogrify -o loop -d 'Add Netscape loop extension to your GIF animation [iterations]'
+complete -c mogrify -o mask -d 'Associate a mask with the image [filename]' -r
+complete -c mogrify -o matte -d 'Store matte channel if the image has one'
+complete -c mogrify -o mattecolor -d 'Frame color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o monitor -d 'Monitor progress '
+complete -c mogrify -o morphology -d 'Apply a morphology method to the image [method kernel]' -xa '(mogrify -list morphology)'
+complete -c mogrify -o orient -d 'Image orientation [type]' -xa '(mogrify -list orientation)'
+complete -c mogrify -o origin -d 'Image origin [geometry]'
+complete -c mogrify -o page -d 'Size and location of an image canvas (setting) [geometry]'
+complete -c mogrify -o path -d 'Path write images to this path on disk'
+complete -c mogrify -o ping -d 'Efficiently determine image attributes'
+complete -c mogrify -o pointsize -d 'Font point size [value]'
+complete -c mogrify -o preview -d 'Image preview type [type]' -xa '(mogrify -list preview)'
+complete -c mogrify -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c mogrify -o quiet -d 'Suppress all warning messages'
+complete -c mogrify -o red-primary -d 'Chromaticity red primary point [point]'
+complete -c mogrify -o regard-warnings -d 'Pay attention to warning messages'
+complete -c mogrify -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c mogrify -o scene -d 'Image scene number [value]'
+complete -c mogrify -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c mogrify -o size -d 'Width and height of image [geometry]'
+complete -c mogrify -o stretch -d 'Render text with this font stretch [type]' -xa '(mogrify -list stretch)'
+complete -c mogrify -o stroke -d 'Graphic primitive stroke color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o strokewidth -d 'Graphic primitive stroke width [value]'
+complete -c mogrify -o style -d 'Render text with this font style [type]' -xa '(mogrify -list style)'
+complete -c mogrify -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c mogrify -o synchronize -d 'Synchronize image to storage device'
+complete -c mogrify -o taint -d 'Declare the image as modified'
+complete -c mogrify -o texture -d 'Name of texture to tile onto the image background [filename]' -r
+complete -c mogrify -o tile-offset -d 'Tile offset [geometry]'
+complete -c mogrify -o treedepth -d 'Color tree depth [value]'
+complete -c mogrify -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o undercolor -d 'Annotation bounding box color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o units -d 'The units of image resolution [type]' -xa '(mogrify -list units)'
+complete -c mogrify -o verbose -d 'Print detailed information about the image'
+complete -c mogrify -o view -d 'FlashPix viewing transforms'
+complete -c mogrify -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(mogrify -list virtual-pixel)'
+complete -c mogrify -o weight -d 'Render text with this font weight [type]' -x
+complete -c mogrify -o white-point -d 'Chromaticity white point [point]'
+complete -c mogrify -o adaptive-blur -d 'Adaptively blur pixels; decrease effect near edges [geometry]'
+complete -c mogrify -o adaptive-resize -d 'Adaptively resize image with data dependent triangulation [geometry]'
+complete -c mogrify -o adaptive-sharpen -d 'Adaptively sharpen pixels; increase effect near edges [geometry]'
+complete -c mogrify -o annotate -d 'Annotate the image with text [geometry text]'
+complete -c mogrify -o auto-orient -d 'Automatically orient image'
+complete -c mogrify -o black-threshold -d 'Force all pixels below the threshold into black [value]'
+complete -c mogrify -o blur -d 'Reduce image noise and reduce detail levels [geometry]'
+complete -c mogrify -o border -d 'Surround image with a border of color [geometry]'
+complete -c mogrify -o charcoal -d 'Simulate a charcoal drawing [radius]'
+complete -c mogrify -o chop -d 'Remove pixels from the image interior [geometry]'
+complete -c mogrify -o clip -d 'Clip along the first path from the 8BIM profile'
+complete -c mogrify -o clip-mask -d 'Associate a clip mask with the image [filename]' -r
+complete -c mogrify -o clip-path -d 'Clip along a named path from the 8BIM profile [id]'
+complete -c mogrify -o colorize -d 'Colorize the image with the fill color [value]'
+complete -c mogrify -o color-matrix -d 'Apply color correction to the image [matrix]'
+complete -c mogrify -o contrast -d 'Enhance or reduce the image contrast'
+complete -c mogrify -o contrast-stretch -d 'Improve contrast by `stretching\' the intensity range [geometry]'
+complete -c mogrify -o convolve -d 'Apply a convolution kernel to the image [coefficients]'
+complete -c mogrify -o cycle -d 'Cycle the image colormap [amount]'
+complete -c mogrify -o despeckle -d 'Reduce the speckles within an image'
+complete -c mogrify -o draw -d 'Annotate the image with a graphic primitive [string]'
+complete -c mogrify -o edge -d 'Apply a filter to detect edges in the image [radius]'
+complete -c mogrify -o emboss -d 'Emboss an image [radius]'
+complete -c mogrify -o enhance -d 'Apply a digital filter to enhance a noisy image'
+complete -c mogrify -o equalize -d 'Perform histogram equalization to an image'
+complete -c mogrify -o evaluate -d 'Evaluate an arithmetic, relational, or logical expression [operator value]'
+complete -c mogrify -o extent -d 'Set the image size [geometry]'
+complete -c mogrify -o extract -d 'Extract area from image [geometry]'
+complete -c mogrify -o fft -d 'Implements the discrete Fourier transform (DFT)'
+complete -c mogrify -o flip -d 'Flip image vertically'
+complete -c mogrify -o floodfill -d 'Color floodfill the image with color [geometry]'
+complete -c mogrify -o flop -d 'Flop image horizontally'
+complete -c mogrify -o frame -d 'Surround image with an ornamental border [geometry]'
+complete -c mogrify -o gamma -d 'Level of gamma correction [value]'
+complete -c mogrify -o gaussian-blur -d 'Reduce image noise and reduce detail levels [geometry]'
+complete -c mogrify -o geometry -d 'Preferred size or location of the image [geometry]'
+complete -c mogrify -o ift -d 'Implements the inverse discrete Fourier transform (DFT)'
+complete -c mogrify -o help -d 'Print program options'
+complete -c mogrify -o identify -d 'Identify the format and characteristics of the image'
+complete -c mogrify -o implode -d 'Implode image pixels about the center [amount]'
+complete -c mogrify -o lat -d 'Local adaptive thresholding [geometry]'
+complete -c mogrify -o layers -d 'Optimize or compare image layers [method]' -xa '(mogrify -list layers)'
+complete -c mogrify -o level -d 'Adjust the level of image contrast [value]'
+complete -c mogrify -o linear-stretch -d 'Improve contrast by `stretching with saturation\' the intensity range [geometry]'
+complete -c mogrify -o median -d 'Apply a median filter to the image [geometry]'
+complete -c mogrify -o mode -d 'Make each pixel the \'predominant color\' of the neighborhood [geometry]'
+complete -c mogrify -o modulate -d 'Vary the brightness, saturation, and hue [value]'
+complete -c mogrify -o monochrome -d 'Transform image to black and white'
+complete -c mogrify -o motion-blur -d 'Simulate motion blur [geometry]'
+complete -c mogrify -o negate -d 'Replace each pixel with its complementary color'
+complete -c mogrify -o noise -d 'Add or reduce noise in an image [geometry]'
+complete -c mogrify -o normalize -d 'Transform image to span the full range of colors'
+complete -c mogrify -o opaque -d 'Change this color to the fill color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o ordered-dither -d 'Add a noise pattern to the image with specific amplitudes [NxN]'
+complete -c mogrify -o paint -d 'Simulate an oil painting [radius]'
+complete -c mogrify -o polaroid -d 'Simulate a Polaroid picture [angle]'
+complete -c mogrify -o posterize -d 'Reduce the image to a limited number of color levels [levels]'
+complete -c mogrify -o print -d 'Interpret string and print to console [string]'
+complete -c mogrify -o profile -d 'Add, delete, or apply an image profile [filename]' -r
+complete -c mogrify -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(mogrify -list colorspace)'
+complete -c mogrify -o radial-blur -d 'Radial blur the image [angle]'
+complete -c mogrify -o raise -d 'Lighten/darken image edges to create a 3-D effect [value]'
+complete -c mogrify -o random-threshold -d 'Random threshold the image [low,high]'
+complete -c mogrify -o region -d 'Apply options to a portion of the image [geometry]'
+complete -c mogrify -o render -d 'Render vector graphics'
+complete -c mogrify -o repage -d 'Size and location of an image canvas [geometry]'
+complete -c mogrify -o resample -d 'Change the resolution of an image [geometry]'
+complete -c mogrify -o resize -d 'Resize the image [geometry]'
+complete -c mogrify -o roll -d 'Roll an image vertically or horizontally [geometry]'
+complete -c mogrify -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c mogrify -o sample -d 'Scale image with pixel sampling [geometry]'
+complete -c mogrify -o scale -d 'Scale the image [geometry]'
+complete -c mogrify -o segment -d 'Segment an image [values]'
+complete -c mogrify -o selective-blur -d 'Selectively blur pixels within a contrast threshold [geometry]'
+complete -c mogrify -o sepia-tone -d 'Simulate a sepia-toned photo [threshold]'
+complete -c mogrify -o set -d 'Set an image property [property value]'
+complete -c mogrify -o shade -d 'Shade the image using a distant light source [degrees]'
+complete -c mogrify -o shadow -d 'Simulate an image shadow [geometry]'
+complete -c mogrify -o sharpen -d 'Sharpen the image [geometry]'
+complete -c mogrify -o shave -d 'Shave pixels from the image edges [geometry]'
+complete -c mogrify -o shear -d 'Slide one edge of the image along the X or Y axis [geometry]'
+complete -c mogrify -o sigmoidal-contrast -d 'Lightness rescaling using sigmoidal contrast enhancement [geometry]'
+complete -c mogrify -o sketch -d 'Simulate a pencil sketch [geometry]'
+complete -c mogrify -o solarize -d 'Negate all pixels above the threshold level [threshold]'
+complete -c mogrify -o splice -d 'Splice the background color into the image [geometry]'
+complete -c mogrify -o spread -d 'Displace image pixels by a random amount [amount]'
+complete -c mogrify -o statistic -d 'Replace each pixel with corresponding statistic from the neighborhood [type geometry]' -xa '(mogrify -list statistic)'
+complete -c mogrify -o strip -d 'Strip image of all profiles and comments'
+complete -c mogrify -o swirl -d 'Swirl image pixels about the center [degrees]'
+complete -c mogrify -o threshold -d 'Threshold the image [value]'
+complete -c mogrify -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c mogrify -o tile -d 'Tile image when filling a graphic primitive [filename]' -r
+complete -c mogrify -o tint -d 'Tint the image with the fill color [value]'
+complete -c mogrify -o transform -d 'Affine transform image'
+complete -c mogrify -o transparent -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
+complete -c mogrify -o transpose -d 'Flip image vertically and rotate 90 degrees'
+complete -c mogrify -o transverse -d 'Flop image horizontally and rotate 270 degrees'
+complete -c mogrify -o trim -d 'Trim image edges'
+complete -c mogrify -o type -d 'Image type [type]' -xa '(mogrify -list type)'
+complete -c mogrify -o unique-colors -d 'Discard all but one of any pixel color'
+complete -c mogrify -o unsharp -d 'Sharpen the image [geometry]'
+complete -c mogrify -o vignette -d 'Soften the edges of the image in vignette style [geometry]'
+complete -c mogrify -o wave -d 'Alter an image along a sine wave [geometry]'
+complete -c mogrify -o white-threshold -d 'Force all pixels above the threshold into white [value]'
+complete -c mogrify -o affinity -d 'Transform image colors to match this set of colors [filename]' -r
+complete -c mogrify -o append -d 'Append an image sequence top to botto (use +append for left to right)'
+complete -c mogrify -o clut -d 'Apply a color lookup table to the image'
+complete -c mogrify -o coalesce -d 'Merge a sequence of images'
+complete -c mogrify -o combine -d 'Combine a sequence of images'
+complete -c mogrify -o composite -d 'Composite image '
+complete -c mogrify -o crop -d 'Cut out a rectangular region of the image [geometry]'
+complete -c mogrify -o deconstruct -d 'Break down an image sequence into constituent parts'
+complete -c mogrify -o evaluate-sequence -d 'Evaluate an arithmetic, relational, or logical expression [operator]'
+complete -c mogrify -o fx -d 'Apply mathematical expression to an image channel(s) [expression]'
+complete -c mogrify -o hald-clut -d 'Apply a Hald color lookup table to the image'
+complete -c mogrify -o morph -d 'Morph an image sequence [value]'
+complete -c mogrify -o mosaic -d 'Create a mosaic from an image sequence'
+complete -c mogrify -o process -d 'Process the image with a custom image filter [arguments]' -xa '(mogrify -list filter)'
+complete -c mogrify -o separate -d 'Separate an image channel into a grayscale image'
+complete -c mogrify -o smush -d 'Smush an image sequence together [geometry]'
+complete -c mogrify -o write -d 'Write images to this file [filename]' -r
+complete -c mogrify -o delete -d 'Delete the image from the image sequence [indexes]'
+complete -c mogrify -o duplicate -d 'Duplicate an image one or more times [count,indexes]'
+complete -c mogrify -o insert -d 'Insert last image into the image sequence [index]'
+complete -c mogrify -o swap -d 'Swap two images in the image sequence [indexes]'
+complete -c mogrify -o debug -d 'Display copious debugging information [events]' -xa '(mogrify -list debug)'
+complete -c mogrify -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c mogrify -o list -d 'Print a list of supported option arguments [type]' -xa '(mogrify -list list)'
diff --git a/share/completions/montage.fish b/share/completions/montage.fish
index 3211f39a5..7c4b59334 100644
--- a/share/completions/montage.fish
+++ b/share/completions/montage.fish
@@ -1,107 +1,107 @@
-complete -c montage -o adjoin                       -d 'Join images into a single multi-image file'
-complete -c montage -o affine                       -d 'Affine transform matrix [matrix]'
-complete -c montage -o alpha                        -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(montage -list alpha)'
-complete -c montage -o authenticate                 -d 'Decipher image with this password [password]'
-complete -c montage -o blue-primary                 -d 'Chromaticity blue primary point [point]'
-complete -c montage -o bordercolor                  -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c montage -o caption                      -d 'Assign a caption to an image [string]'
-complete -c montage -o channel                      -d 'Apply option to select image channels [type]' -xa '(montage -list channel)'
-complete -c montage -o colors                       -d 'Preferred number of colors in the image [value]'
-complete -c montage -o colorspace                   -d 'Alternate image colorsapce [type]' -xa '(montage -list colorspace)'
-complete -c montage -o comment                      -d 'Annotate image with comment [string]'
-complete -c montage -o compose                      -d 'Composite operator [operator]'
-complete -c montage -o compress                     -d 'Type of pixel compression when writing the image [type]' -xa '(montage -list compress)'
-complete -c montage -o define                       -d 'Define one or more image format options [format:option]'
-complete -c montage -o density                      -d 'Horizontal and vertical density of the image [geometry]'
-complete -c montage -o depth                        -d 'Image depth [value]'
-complete -c montage -o display                      -d 'Query font from this X server [server]'
-complete -c montage -o dispose                      -d 'Layer disposal method [method]' -xa '(montage -list dispose)'
-complete -c montage -o dither                       -d 'Apply error diffusion to image [method]' -xa '(montage -list dither)'
-complete -c montage -o draw                         -d 'Annotate the image with a graphic primitive [string]'
-complete -c montage -o encoding                     -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
-complete -c montage -o endian                       -d 'Endianness (MSB or LSB) of the image [type]' -xa '(montage -list endian)'
-complete -c montage -o extract                      -d 'Extract area from image [geometry]'
-complete -c montage -o fill                         -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
-complete -c montage -o filter                       -d 'Use this filter when resizing an image [type]' -xa '(montage -list filter)'
-complete -c montage -o font                         -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
-complete -c montage -o format                       -d 'Output formatted image characteristics ["string"]'
-complete -c montage -o gamma                        -d 'Level of gamma correction [value]'
-complete -c montage -o geometry                     -d 'Preferred tile and border sizes [geometry]'
-complete -c montage -o gravity                      -d 'Direction which direction to gravitate towards'
-complete -c montage -o green-primary                -d 'Chromaticity green primary point [point]'
-complete -c montage -o identify                     -d 'Identify the format and characteristics of the image'
-complete -c montage -o interlace                    -d 'Type of image interlacing scheme [type]' -xa '(montage -list interlace)'
-complete -c montage -o interpolate                  -d 'Pixel color interpolation method [method]' -xa '(montage -list interpolate)'
-complete -c montage -o kerning                      -d 'Set the space between two letters [value]'
-complete -c montage -o label                        -d 'Assign a label to an image [string]'
-complete -c montage -o limit                        -d 'Pixel cache resource limit [type value]' -x
-complete -c montage -o mattecolor                   -d 'Frame color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c montage -o mode                         -d 'Framing style [type]' -xa '(montage -list mode)'
-complete -c montage -o monitor                      -d 'Monitor progress '
-complete -c montage -o origin                       -d 'Image origin [geometry]'
-complete -c montage -o page                         -d 'Size and location of an image canvas (setting) [geometry]'
-complete -c montage -o pointsize                    -d 'Font point size [value]'
-complete -c montage -o profile                      -d 'Add, delete, or apply an image profile [filename]' -r
-complete -c montage -o quality                      -d 'JPEG/MIFF/PNG compression level [value]'
-complete -c montage -o quantize                     -d 'Reduce colors in this colorspace [colorspace]' -xa '(montage -list colorspace)'
-complete -c montage -o quiet                        -d 'Suppress all warning messages'
-complete -c montage -o red-primary                  -d 'Chromaticity red primary point [point]'
-complete -c montage -o regard-warnings              -d 'Pay attention to warning messages'
-complete -c montage -o respect-parentheses          -d 'Settings remain in effect until parenthesis boundary'
-complete -c montage -o sampling-factor              -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c montage -o scenes                       -d 'Range image scene range'
-complete -c montage -o seed                         -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c montage -o set                          -d 'Attribute set an image attribute [ value]'
-complete -c montage -o shadow                       -d 'Add a shadow beneath a tile to simulate depth'
-complete -c montage -o size                         -d 'Width and height of image [geometry]'
-complete -c montage -o stroke                       -d 'Color to use when stroking a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
-complete -c montage -o synchronize                  -d 'Synchronize image to storage device'
-complete -c montage -o taint                        -d 'Declare the image as modified'
-complete -c montage -o texture                      -d 'Name of texture to tile onto the image background [filename]' -r
-complete -c montage -o thumbnail                    -d 'Create a thumbnail of the image [geometry]'
-complete -c montage -o tile                         -d 'Number of tiles per row and column [geometry]'
-complete -c montage -o title                        -d 'Decorate the montage image with a title [string]'
-complete -c montage -o transparent-color            -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c montage -o treedepth                    -d 'Color tree depth [value]'
-complete -c montage -o trim                         -d 'Trim image edges'
-complete -c montage -o units                        -d 'The units of image resolution [type]' -xa '(montage -list units)'
-complete -c montage -o verbose                      -d 'Print detailed information about the image'
-complete -c montage -o virtual-pixel                -d 'Virtual pixel access method [method]' -xa '(montage -list virtual-pixel)'
-complete -c montage -o white-point                  -d 'Chromaticity white point [point]'
-complete -c montage -o adaptive-sharpen             -d 'Adaptively sharpen pixels; increase effect near edges annotate geometry text annotate the image with text [geometry]'
-complete -c montage -o auto-orient                  -d 'Automagically orient image'
-complete -c montage -o blur                         -d 'Reduce image noise and reduce detail levels [geometry]'
-complete -c montage -o border                       -d 'Surround image with a border of color [geometry]'
-complete -c montage -o crop                         -d 'Preferred size and location of the cropped image [geometry]'
-complete -c montage -o extent                       -d 'Set the image size [geometry]'
-complete -c montage -o flatten                      -d 'Flatten a sequence of images'
-complete -c montage -o flip                         -d 'Flip image in the vertical direction'
-complete -c montage -o flop                         -d 'Flop image in the horizontal direction'
-complete -c montage -o frame                        -d 'Surround image with an ornamental border [geometry]'
-complete -c montage -o monochrome                   -d 'Transform image to black and white'
-complete -c montage -o polaroid                     -d 'Simulate a Polaroid picture [angle]'
-complete -c montage -o repage                       -d 'Size and location of an image canvas (operator) [geometry]'
-complete -c montage -o resize                       -d 'Resize the image [geometry]'
-complete -c montage -o rotate                       -d 'Apply Paeth rotation to the image [degrees]'
-complete -c montage -o strip                        -d 'Strip image of all profiles and comments'
-complete -c montage -o transform                    -d 'Affine transform image'
-complete -c montage -o transpose                    -d 'Flip image vertically and rotate 90 degrees'
-complete -c montage -o transparent                  -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
-complete -c montage -o type                         -d 'Image type [type]' -xa '(montage -list type)'
-complete -c montage -o unsharp                      -d 'Sharpen the image [geometry]'
-complete -c montage -o coalesce                     -d 'Merge a sequence of images'
-complete -c montage -o composite                    -d 'Composite image '
-complete -c montage -o clone                        -d 'Clone an image [indexes]'
-complete -c montage -o delete                       -d 'Delete the image from the image sequence [indexes]'
-complete -c montage -o duplicate                    -d 'Duplicate an image one or more times [count,indexes]'
-complete -c montage -o insert                       -d 'Insert last image into the image sequence [index]'
-complete -c montage -o reverse                      -d 'Reverse image sequence'
-complete -c montage -o swap                         -d 'Swap two images in the image sequence [indexes]'
-complete -c montage -o debug                        -d 'Display copious debugging information [events]' -xa '(montage -list debug)'
-complete -c montage -o help                         -d 'Print program options'
-complete -c montage -o list                         -d 'Print a list of supported option arguments [type]' -xa '(montage -list list)'
-complete -c montage -o log                          -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c montage -o version                      -d 'Print version information'
-complete -c montage -o matte                        -d 'Store matte channel if the image has one'
-complete -c montage -o support                      -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
-complete -c montage -o annotate                     -d 'Annotate the image with text [geometry text]'
+complete -c montage -o adjoin -d 'Join images into a single multi-image file'
+complete -c montage -o affine -d 'Affine transform matrix [matrix]'
+complete -c montage -o alpha -d 'On, activate, off, deactivate, set, opaque, copy transparent, extract, background, or shape [option]' -xa '(montage -list alpha)'
+complete -c montage -o authenticate -d 'Decipher image with this password [password]'
+complete -c montage -o blue-primary -d 'Chromaticity blue primary point [point]'
+complete -c montage -o bordercolor -d 'Border color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c montage -o caption -d 'Assign a caption to an image [string]'
+complete -c montage -o channel -d 'Apply option to select image channels [type]' -xa '(montage -list channel)'
+complete -c montage -o colors -d 'Preferred number of colors in the image [value]'
+complete -c montage -o colorspace -d 'Alternate image colorsapce [type]' -xa '(montage -list colorspace)'
+complete -c montage -o comment -d 'Annotate image with comment [string]'
+complete -c montage -o compose -d 'Composite operator [operator]'
+complete -c montage -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(montage -list compress)'
+complete -c montage -o define -d 'Define one or more image format options [format:option]'
+complete -c montage -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c montage -o depth -d 'Image depth [value]'
+complete -c montage -o display -d 'Query font from this X server [server]'
+complete -c montage -o dispose -d 'Layer disposal method [method]' -xa '(montage -list dispose)'
+complete -c montage -o dither -d 'Apply error diffusion to image [method]' -xa '(montage -list dither)'
+complete -c montage -o draw -d 'Annotate the image with a graphic primitive [string]'
+complete -c montage -o encoding -d 'Encoding type [type text]' -xa '(__fish_print_encodings)'
+complete -c montage -o endian -d 'Endianness (MSB or LSB) of the image [type]' -xa '(montage -list endian)'
+complete -c montage -o extract -d 'Extract area from image [geometry]'
+complete -c montage -o fill -d 'Color to use when filling a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
+complete -c montage -o filter -d 'Use this filter when resizing an image [type]' -xa '(montage -list filter)'
+complete -c montage -o font -d 'Render text with this font [name]' -xa '(__fish_complete_convert_options font)'
+complete -c montage -o format -d 'Output formatted image characteristics ["string"]'
+complete -c montage -o gamma -d 'Level of gamma correction [value]'
+complete -c montage -o geometry -d 'Preferred tile and border sizes [geometry]'
+complete -c montage -o gravity -d 'Direction which direction to gravitate towards'
+complete -c montage -o green-primary -d 'Chromaticity green primary point [point]'
+complete -c montage -o identify -d 'Identify the format and characteristics of the image'
+complete -c montage -o interlace -d 'Type of image interlacing scheme [type]' -xa '(montage -list interlace)'
+complete -c montage -o interpolate -d 'Pixel color interpolation method [method]' -xa '(montage -list interpolate)'
+complete -c montage -o kerning -d 'Set the space between two letters [value]'
+complete -c montage -o label -d 'Assign a label to an image [string]'
+complete -c montage -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c montage -o mattecolor -d 'Frame color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c montage -o mode -d 'Framing style [type]' -xa '(montage -list mode)'
+complete -c montage -o monitor -d 'Monitor progress '
+complete -c montage -o origin -d 'Image origin [geometry]'
+complete -c montage -o page -d 'Size and location of an image canvas (setting) [geometry]'
+complete -c montage -o pointsize -d 'Font point size [value]'
+complete -c montage -o profile -d 'Add, delete, or apply an image profile [filename]' -r
+complete -c montage -o quality -d 'JPEG/MIFF/PNG compression level [value]'
+complete -c montage -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(montage -list colorspace)'
+complete -c montage -o quiet -d 'Suppress all warning messages'
+complete -c montage -o red-primary -d 'Chromaticity red primary point [point]'
+complete -c montage -o regard-warnings -d 'Pay attention to warning messages'
+complete -c montage -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c montage -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c montage -o scenes -d 'Range image scene range'
+complete -c montage -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c montage -o set -d 'Attribute set an image attribute [ value]'
+complete -c montage -o shadow -d 'Add a shadow beneath a tile to simulate depth'
+complete -c montage -o size -d 'Width and height of image [geometry]'
+complete -c montage -o stroke -d 'Color to use when stroking a graphic primitive [color]' -xa '(__fish_complete_convert_options color)'
+complete -c montage -o synchronize -d 'Synchronize image to storage device'
+complete -c montage -o taint -d 'Declare the image as modified'
+complete -c montage -o texture -d 'Name of texture to tile onto the image background [filename]' -r
+complete -c montage -o thumbnail -d 'Create a thumbnail of the image [geometry]'
+complete -c montage -o tile -d 'Number of tiles per row and column [geometry]'
+complete -c montage -o title -d 'Decorate the montage image with a title [string]'
+complete -c montage -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c montage -o treedepth -d 'Color tree depth [value]'
+complete -c montage -o trim -d 'Trim image edges'
+complete -c montage -o units -d 'The units of image resolution [type]' -xa '(montage -list units)'
+complete -c montage -o verbose -d 'Print detailed information about the image'
+complete -c montage -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(montage -list virtual-pixel)'
+complete -c montage -o white-point -d 'Chromaticity white point [point]'
+complete -c montage -o adaptive-sharpen -d 'Adaptively sharpen pixels; increase effect near edges annotate geometry text annotate the image with text [geometry]'
+complete -c montage -o auto-orient -d 'Automagically orient image'
+complete -c montage -o blur -d 'Reduce image noise and reduce detail levels [geometry]'
+complete -c montage -o border -d 'Surround image with a border of color [geometry]'
+complete -c montage -o crop -d 'Preferred size and location of the cropped image [geometry]'
+complete -c montage -o extent -d 'Set the image size [geometry]'
+complete -c montage -o flatten -d 'Flatten a sequence of images'
+complete -c montage -o flip -d 'Flip image in the vertical direction'
+complete -c montage -o flop -d 'Flop image in the horizontal direction'
+complete -c montage -o frame -d 'Surround image with an ornamental border [geometry]'
+complete -c montage -o monochrome -d 'Transform image to black and white'
+complete -c montage -o polaroid -d 'Simulate a Polaroid picture [angle]'
+complete -c montage -o repage -d 'Size and location of an image canvas (operator) [geometry]'
+complete -c montage -o resize -d 'Resize the image [geometry]'
+complete -c montage -o rotate -d 'Apply Paeth rotation to the image [degrees]'
+complete -c montage -o strip -d 'Strip image of all profiles and comments'
+complete -c montage -o transform -d 'Affine transform image'
+complete -c montage -o transpose -d 'Flip image vertically and rotate 90 degrees'
+complete -c montage -o transparent -d 'Make this color transparent within the image [color]' -xa '(__fish_complete_convert_options color)'
+complete -c montage -o type -d 'Image type [type]' -xa '(montage -list type)'
+complete -c montage -o unsharp -d 'Sharpen the image [geometry]'
+complete -c montage -o coalesce -d 'Merge a sequence of images'
+complete -c montage -o composite -d 'Composite image '
+complete -c montage -o clone -d 'Clone an image [indexes]'
+complete -c montage -o delete -d 'Delete the image from the image sequence [indexes]'
+complete -c montage -o duplicate -d 'Duplicate an image one or more times [count,indexes]'
+complete -c montage -o insert -d 'Insert last image into the image sequence [index]'
+complete -c montage -o reverse -d 'Reverse image sequence'
+complete -c montage -o swap -d 'Swap two images in the image sequence [indexes]'
+complete -c montage -o debug -d 'Display copious debugging information [events]' -xa '(montage -list debug)'
+complete -c montage -o help -d 'Print program options'
+complete -c montage -o list -d 'Print a list of supported option arguments [type]' -xa '(montage -list list)'
+complete -c montage -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c montage -o version -d 'Print version information'
+complete -c montage -o matte -d 'Store matte channel if the image has one'
+complete -c montage -o support -d 'Resize support: > 1.0 is blurry, < 1.0 is sharp [factor]'
+complete -c montage -o annotate -d 'Annotate the image with text [geometry text]'
diff --git a/share/completions/mv.fish b/share/completions/mv.fish
index e8eb6f40d..afa375f55 100644
--- a/share/completions/mv.fish
+++ b/share/completions/mv.fish
@@ -4,7 +4,7 @@ set -l uname (uname -s)
 if mv --version >/dev/null 2>/dev/null
     # --backup requires an argument, -b does not accept an argument
     complete -c mv -l backup -r -d "Backup each existing destination file" \
-             -x -ka "none\t'Never make backups'
+        -x -ka "none\t'Never make backups'
                      off\t'Never make backups'
                      numbered\t'Make numbered backups'
                      t\t'Make numbered backups'
@@ -22,17 +22,17 @@ if mv --version >/dev/null 2>/dev/null
     complete -c mv -l strip-trailing-slashes -d "Remove trailing '/' from source args"
     complete -c mv -s S -l suffix -x -d "Override default backup suffix"
     complete -c mv -s t -l target-directory -d "Move all source args into DIR" \
-             -x -a "(__fish_complete_directories (commandline -ct) 'Directory')"
+        -x -a "(__fish_complete_directories (commandline -ct) 'Directory')"
     complete -c mv -s T -l no-target-directory -d "Treat DEST as a normal file"
     complete -c mv -s u -l update -d "Don't overwrite newer"
     complete -c mv -s v -l verbose -d "Print filenames as it goes"
     test "$uname" = Linux
-        and complete -c mv -s Z -l context -d "Set SELinux context to default"
+    and complete -c mv -s Z -l context -d "Set SELinux context to default"
 
     complete -c mv -l help -d "Print help and exit"
     complete -c mv -l version -d "Print version and exit"
-## BSD-ish mv
-else             #[posix][ext]
+    ## BSD-ish mv
+else #[posix][ext]
     # freebsd:   mv [-fi][nvh] src dst
     # dragonfly: mv [-fi][nvh] src dst
     # macos:     mv [-fi][nv ] src dst
@@ -45,18 +45,18 @@ else             #[posix][ext]
     complete -c mv -s i -d "Prompt to overwrite existing"
 
     test uname = SunOS # -fi
-        and exit 0
+    and exit 0
 
     # Extensions
     complete -c mv -s v -d "Print filenames as it goes"
 
     contains "$uname" NetBSD OpenBSD # -fiv
-        and exit 0
+    and exit 0
 
     complete -c mv -s n -d "Don't overwrite existing"
 
     test "$uname" = Darwin # -fivn
-        and exit 0
+    and exit 0
 
     complete -c mv -s h -d "Don't follow target if it links to a dir"
 end
diff --git a/share/completions/mvn.fish b/share/completions/mvn.fish
index a3d50ffb1..153884f22 100644
--- a/share/completions/mvn.fish
+++ b/share/completions/mvn.fish
@@ -27,62 +27,62 @@
 complete -c mvn -f -a 'pre-clean clean post-clean validate initialize generate-sources process-sources generate-resources process-resources compile process-classes generate-test-sources process-test-sources generate-test-resources process-test-resources test-compile process-test-classes testprepare-package package pre-integration-test integration-test post-integration-test verify install deploy pre-site site post-site site-deploy'
 
 # All options form mvn --help
-complete -c mvn -f -o am -l also-make                        -d "If project list is specified, also build projects required by the list"
-complete -c mvn -f -o amd -l also-make-dependents            -d "If project list is specified, also build projects that depend on projects on the list"
-complete -c mvn -f -o B -l batch-mode                        -d "Run in non-interactive (batch) mode"
-complete -c mvn -r -f -o b -l builder                      -d "The id of the build strategy to use."
-complete -c mvn -f -o C -l strict-checksums                  -d "Fail the build if checksums don't match"
-complete -c mvn -f -o c -l lax-checksums                     -d "Warn if checksums don't match"
-complete -c mvn -f -o cpu -l check-plugin-updates            -d "Ineffective, only kept for backward compatibility"
-complete -c mvn -f -o D -l define                      -d "Define a system property"
-complete -c mvn -f -o e -l errors                            -d "Produce execution error messages"
-complete -c mvn -f -o emp -l encrypt-master-password   -d "Encrypt master security password"
-complete -c mvn -f -o ep -l encrypt-password           -d "Encrypt server password"
-complete -c mvn -r -o f -l file                        -d "Force the use of an alternate POM file (or directory with pom.xml)."
-complete -c mvn -f -o fae -l fail-at-end                     -d "Only fail the build afterwards; allow all non-impacted builds to continue"
-complete -c mvn -f -o ff -l fail-fast                        -d "Stop at first failure in reactorized builds"
-complete -c mvn -f -o fn -l fail-never                       -d "NEVER fail the build, regardless of project result"
-complete -c mvn -r -o gs -l global-settings            -d "Alternate path for the global settings file"
-complete -c mvn -f -o h -l help                              -d "Display help information"
-complete -c mvn -r -o l -l log-file                    -d "Log file to where all build output will go."
-complete -c mvn -f -o llr -l legacy-local-repository         -d "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true"
-complete -c mvn -f -o N -l non-recursive                     -d "Do not recurse into sub-projects"
-complete -c mvn -f -o npr -l no-plugin-registry              -d "Ineffective, only kept for backward compatibility"
-complete -c mvn -f -o npu -l no-plugin-updates               -d "Ineffective, only kept for backward compatibility"
-complete -c mvn -f -o nsu -l no-snapshot-updates             -d "Suppress SNAPSHOT updates"
-complete -c mvn -f -o o -l offline                           -d "Work offline"
-complete -c mvn -r -f -o pl -l projects                   -d "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path."
-complete -c mvn -f -o q -l quiet                             -d "Quiet output - only show errors"
-complete -c mvn -r -f -o rf -l resume-from                -d "Resume reactor from specified project"
-complete -c mvn -r -o s -l settings                    -d "Alternate path for the user settings file"
-complete -c mvn -r -f -o T -l threads                     -d "Thread count, for instance 2.0C where C is core multiplied"
-complete -c mvn -r -o t -l toolchains                  -d "Alternate path for the user toolchains file"
-complete -c mvn -f -o U -l update-snapshots                  -d "Forces a check for missing releases and updated snapshots on remote repositories"
-complete -c mvn -f -o up -l update-plugins                   -d "Ineffective, only kept for backward compatibility"
-complete -c mvn -f -o V -l show-version                      -d "Display version information WITHOUT stopping build"
-complete -c mvn -f -o v -l version                           -d "Display version information"
-complete -c mvn -f -o X -l debug                             -d "Produce execution debug output"
+complete -c mvn -f -o am -l also-make -d "If project list is specified, also build projects required by the list"
+complete -c mvn -f -o amd -l also-make-dependents -d "If project list is specified, also build projects that depend on projects on the list"
+complete -c mvn -f -o B -l batch-mode -d "Run in non-interactive (batch) mode"
+complete -c mvn -r -f -o b -l builder -d "The id of the build strategy to use."
+complete -c mvn -f -o C -l strict-checksums -d "Fail the build if checksums don't match"
+complete -c mvn -f -o c -l lax-checksums -d "Warn if checksums don't match"
+complete -c mvn -f -o cpu -l check-plugin-updates -d "Ineffective, only kept for backward compatibility"
+complete -c mvn -f -o D -l define -d "Define a system property"
+complete -c mvn -f -o e -l errors -d "Produce execution error messages"
+complete -c mvn -f -o emp -l encrypt-master-password -d "Encrypt master security password"
+complete -c mvn -f -o ep -l encrypt-password -d "Encrypt server password"
+complete -c mvn -r -o f -l file -d "Force the use of an alternate POM file (or directory with pom.xml)."
+complete -c mvn -f -o fae -l fail-at-end -d "Only fail the build afterwards; allow all non-impacted builds to continue"
+complete -c mvn -f -o ff -l fail-fast -d "Stop at first failure in reactorized builds"
+complete -c mvn -f -o fn -l fail-never -d "NEVER fail the build, regardless of project result"
+complete -c mvn -r -o gs -l global-settings -d "Alternate path for the global settings file"
+complete -c mvn -f -o h -l help -d "Display help information"
+complete -c mvn -r -o l -l log-file -d "Log file to where all build output will go."
+complete -c mvn -f -o llr -l legacy-local-repository -d "Use Maven 2 Legacy Local Repository behaviour, ie no use of _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true"
+complete -c mvn -f -o N -l non-recursive -d "Do not recurse into sub-projects"
+complete -c mvn -f -o npr -l no-plugin-registry -d "Ineffective, only kept for backward compatibility"
+complete -c mvn -f -o npu -l no-plugin-updates -d "Ineffective, only kept for backward compatibility"
+complete -c mvn -f -o nsu -l no-snapshot-updates -d "Suppress SNAPSHOT updates"
+complete -c mvn -f -o o -l offline -d "Work offline"
+complete -c mvn -r -f -o pl -l projects -d "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path."
+complete -c mvn -f -o q -l quiet -d "Quiet output - only show errors"
+complete -c mvn -r -f -o rf -l resume-from -d "Resume reactor from specified project"
+complete -c mvn -r -o s -l settings -d "Alternate path for the user settings file"
+complete -c mvn -r -f -o T -l threads -d "Thread count, for instance 2.0C where C is core multiplied"
+complete -c mvn -r -o t -l toolchains -d "Alternate path for the user toolchains file"
+complete -c mvn -f -o U -l update-snapshots -d "Forces a check for missing releases and updated snapshots on remote repositories"
+complete -c mvn -f -o up -l update-plugins -d "Ineffective, only kept for backward compatibility"
+complete -c mvn -f -o V -l show-version -d "Display version information WITHOUT stopping build"
+complete -c mvn -f -o v -l version -d "Display version information"
+complete -c mvn -f -o X -l debug -d "Produce execution debug output"
 
 #
 # Profiles
 #
 #TODO search pom.xml hierarchy
 function __fish_mvn_profiles
-	# find line opening the profile-tag
-	# read next line
-	# extract contents of id-tag
-	sed -n -e '/<profile>/{n; s!^.*<id>\([^<]*\)</id>.*$!\1!; p}' ~/.m2/settings.xml pom.xml ^/dev/null
+    # find line opening the profile-tag
+    # read next line
+    # extract contents of id-tag
+    sed -n -e '/<profile>/{n; s!^.*<id>\([^<]*\)</id>.*$!\1!; p}' ~/.m2/settings.xml pom.xml ^/dev/null
 end
 
-complete -c mvn -f -r -o P -l activate-profiles -a "(__fish_mvn_profiles)"    -d "Comma-delimited list of profiles to activate"
+complete -c mvn -f -r -o P -l activate-profiles -a "(__fish_mvn_profiles)" -d "Comma-delimited list of profiles to activate"
 
 
 #default properties for some plugins / profiles
-complete -c mvn -o DskipTests                             -d "Skipping JUnit Tests"
-complete -c mvn -o DbuildInstaller                        -d "Build installer (if profile is available in project)"
-complete -c mvn -o DperformRelease                        -d "Use release profile (create javadoc and attach sources)"
-complete -c mvn -o Dmaven.surefire.debug                  -d "Run surefire tests with debugging on port 5005"
-complete -c mvn -o Dmaven.javadoc.skip                  -d "Skip Javadoc generation"
+complete -c mvn -o DskipTests -d "Skipping JUnit Tests"
+complete -c mvn -o DbuildInstaller -d "Build installer (if profile is available in project)"
+complete -c mvn -o DperformRelease -d "Use release profile (create javadoc and attach sources)"
+complete -c mvn -o Dmaven.surefire.debug -d "Run surefire tests with debugging on port 5005"
+complete -c mvn -o Dmaven.javadoc.skip -d "Skip Javadoc generation"
 
 
 #
diff --git a/share/completions/namei.fish b/share/completions/namei.fish
index bc4a80bff..4e7650c43 100644
--- a/share/completions/namei.fish
+++ b/share/completions/namei.fish
@@ -1,8 +1,8 @@
-complete -c namei -s h -l help         -d 'displays this help text'
-complete -c namei -s V -l version      -d 'output version information and exit'
-complete -c namei -s x -l mountpoints  -d 'show mount point directories with a \'D\''
-complete -c namei -s m -l modes        -d 'show the mode bits of each file'
-complete -c namei -s o -l owners       -d 'show owner and group name of each file'
-complete -c namei -s l -l long         -d 'use a long listing format (-m -o -v)'
-complete -c namei -s n -l nosymlinks   -d 'don\'t follow symlinks'
-complete -c namei -s v -l vertical     -d 'vertical align of modes and owners'
+complete -c namei -s h -l help -d 'displays this help text'
+complete -c namei -s V -l version -d 'output version information and exit'
+complete -c namei -s x -l mountpoints -d 'show mount point directories with a \'D\''
+complete -c namei -s m -l modes -d 'show the mode bits of each file'
+complete -c namei -s o -l owners -d 'show owner and group name of each file'
+complete -c namei -s l -l long -d 'use a long listing format (-m -o -v)'
+complete -c namei -s n -l nosymlinks -d 'don\'t follow symlinks'
+complete -c namei -s v -l vertical -d 'vertical align of modes and owners'
diff --git a/share/completions/netctl.fish b/share/completions/netctl.fish
index 46d9d8435..46aafb9e9 100644
--- a/share/completions/netctl.fish
+++ b/share/completions/netctl.fish
@@ -1,7 +1,7 @@
 set -l cmds list store restore stop-all start stop restart switch-to status enable disable reenable is-enabled edit
 
 function __fish_netctl_get_profiles
-  command netctl list | sed -e 's/^[ \t*]*//'
+    command netctl list | sed -e 's/^[ \t*]*//'
 end
 
 complete -f -c netctl -l help -d 'Display help'
diff --git a/share/completions/ngrok.fish b/share/completions/ngrok.fish
index 5849f2dd6..b3c754478 100644
--- a/share/completions/ngrok.fish
+++ b/share/completions/ngrok.fish
@@ -1,40 +1,40 @@
 # Commands
 complete -c ngrok -f -a "authtoken" -d "Save authtoken to configuration file"
-complete -c ngrok -f -a "credits"   -d "Prints author and licensing information"
-complete -c ngrok -f -a "http"      -d "Start an HTTP tunnel"
-complete -c ngrok -f -a "start"     -d "Start tunnels by name from the configuration file"
-complete -c ngrok -f -a "tcp"       -d "Start a TCP tunnel"
-complete -c ngrok -f -a "tls"       -d "Start a TLS tunnel"
-complete -c ngrok -f -a "update"    -d "Update ngrok to the latest version"
-complete -c ngrok -f -a "version"   -d "Print the version string"
-complete -c ngrok -f -a "help"      -d "Shows a list of commands or help for one command"
+complete -c ngrok -f -a "credits" -d "Prints author and licensing information"
+complete -c ngrok -f -a "http" -d "Start an HTTP tunnel"
+complete -c ngrok -f -a "start" -d "Start tunnels by name from the configuration file"
+complete -c ngrok -f -a "tcp" -d "Start a TCP tunnel"
+complete -c ngrok -f -a "tls" -d "Start a TLS tunnel"
+complete -c ngrok -f -a "update" -d "Update ngrok to the latest version"
+complete -c ngrok -f -a "version" -d "Print the version string"
+complete -c ngrok -f -a "help" -d "Shows a list of commands or help for one command"
 
 # General Options
-complete -c ngrok -l "help"       -e -f
-complete -c ngrok -l "authtoken"  -r                          -d "ngrok.com authtoken identifying a user"
-complete -c ngrok -l "config"     -r                          -d "path to config files; they are merged if multiple"
-complete -c ngrok -l "log"        -x -a "false stderr stdout" -d "path to log file, 'stdout', 'stderr' or 'false'"
-complete -c ngrok -l "log-format" -x -a "term logfmt json"    -d "log record format: 'term', 'logfmt', 'json'"
-complete -c ngrok -l "log-level"  -r -a "info"                -d "logging level"
-complete -c ngrok -l "region"     -x -a "us eu au ap"         -d "ngrok server region [us , eu, au, ap] (default: us)"
+complete -c ngrok -l "help" -e -f
+complete -c ngrok -l "authtoken" -r -d "ngrok.com authtoken identifying a user"
+complete -c ngrok -l "config" -r -d "path to config files; they are merged if multiple"
+complete -c ngrok -l "log" -x -a "false stderr stdout" -d "path to log file, 'stdout', 'stderr' or 'false'"
+complete -c ngrok -l "log-format" -x -a "term logfmt json" -d "log record format: 'term', 'logfmt', 'json'"
+complete -c ngrok -l "log-level" -r -a "info" -d "logging level"
+complete -c ngrok -l "region" -x -a "us eu au ap" -d "ngrok server region [us , eu, au, ap] (default: us)"
 
 # http & tls's options
-complete -c ngrok -l "hostname"  -r -d "host tunnel on custom hostname (requires DNS CNAME)"
+complete -c ngrok -l "hostname" -r -d "host tunnel on custom hostname (requires DNS CNAME)"
 complete -c ngrok -l "subdomain" -r -d "host tunnel on a custom subdomain"
 
 # http's optons
-complete -c ngrok -l "auth"        -r                      -d "enforce basic auth on tunnel endpoint, 'user:password'"
-complete -c ngrok -l "bind-tls"    -x -a "both https http" -d "listen for http, https or both: true/false/both"
-complete -c ngrok -l "host-header" -r                      -d "set Host header; if 'rewrite' use local address hostname"
-complete -c ngrok -l "inspect"                             -d "enable/disable http introspection"
+complete -c ngrok -l "auth" -r -d "enforce basic auth on tunnel endpoint, 'user:password'"
+complete -c ngrok -l "bind-tls" -x -a "both https http" -d "listen for http, https or both: true/false/both"
+complete -c ngrok -l "host-header" -r -d "set Host header; if 'rewrite' use local address hostname"
+complete -c ngrok -l "inspect" -d "enable/disable http introspection"
 
 # tls's options
 complete -c ngrok -l "client-cas" -r -d "path to TLS certificate authority to verify client certs"
-complete -c ngrok -l "crt"        -r -d "path to a TLS certificate for TLS termination"
-complete -c ngrok -l "key"        -r -d "path to a TLS key for TLS termination"
+complete -c ngrok -l "crt" -r -d "path to a TLS certificate for TLS termination"
+complete -c ngrok -l "key" -r -d "path to a TLS key for TLS termination"
 
 # start's options
-complete -c ngrok -l "all"  -d "start all tunnels in the configuration file"
+complete -c ngrok -l "all" -d "start all tunnels in the configuration file"
 complete -c ngrok -l "none" -d "start running no tunnels"
 
 # tcp's options
diff --git a/share/completions/nl.fish b/share/completions/nl.fish
index f7955deaf..e403a2eae 100644
--- a/share/completions/nl.fish
+++ b/share/completions/nl.fish
@@ -3,19 +3,19 @@ t\t"number only nonempty lines"
 n\t"number no lines"
 p\t"number only lines that match regular expression"'
 
-complete -c nl -s b -l body-numbering            -d 'use STYLE for numbering body lines' -xa $style
-complete -c nl -s d -l section-delimiter -x      -d 'use for separating logical pages'
-complete -c nl -s f -l footer-numbering          -d 'use STYLE for numbering footer lines' -xa $style
-complete -c nl -s h -l header-numbering          -d 'use STYLE for numbering header lines' -xa $style
-complete -c nl -s i -l line-increment -x         -d 'line number increment at each line'
-complete -c nl -s l -l join-blank-lines -x       -d 'group of NUMBER empty lines counted as one'
-complete -c nl -s n -l number-format -x          -d 'insert line numbers according to FORMAT'
-complete -c nl -s n -l number-format -xa ln      -d 'left justified, no leading zeroes'
-complete -c nl -s n -l number-format -xa rn      -d 'right justified, no leading zeroes'
-complete -c nl -s n -l number-format -xa rz      -d 'right justified, leading zeroes'
-complete -c nl -s p -l no-renumber               -d 'do not reset line numbers at logical pages'
-complete -c nl -s s -l number-separator -x       -d 'add STRING after (possible) line number'
-complete -c nl -s v -l starting-line-number -x   -d 'first line number on each logical page'
-complete -c nl -s w -l number-width -x           -d 'use NUMBER columns for line numbers'
-complete -c nl -l help     -d 'display this help and exit'
-complete -c nl -l version  -d 'output version information and exit'
+complete -c nl -s b -l body-numbering -d 'use STYLE for numbering body lines' -xa $style
+complete -c nl -s d -l section-delimiter -x -d 'use for separating logical pages'
+complete -c nl -s f -l footer-numbering -d 'use STYLE for numbering footer lines' -xa $style
+complete -c nl -s h -l header-numbering -d 'use STYLE for numbering header lines' -xa $style
+complete -c nl -s i -l line-increment -x -d 'line number increment at each line'
+complete -c nl -s l -l join-blank-lines -x -d 'group of NUMBER empty lines counted as one'
+complete -c nl -s n -l number-format -x -d 'insert line numbers according to FORMAT'
+complete -c nl -s n -l number-format -xa ln -d 'left justified, no leading zeroes'
+complete -c nl -s n -l number-format -xa rn -d 'right justified, no leading zeroes'
+complete -c nl -s n -l number-format -xa rz -d 'right justified, leading zeroes'
+complete -c nl -s p -l no-renumber -d 'do not reset line numbers at logical pages'
+complete -c nl -s s -l number-separator -x -d 'add STRING after (possible) line number'
+complete -c nl -s v -l starting-line-number -x -d 'first line number on each logical page'
+complete -c nl -s w -l number-width -x -d 'use NUMBER columns for line numbers'
+complete -c nl -l help -d 'display this help and exit'
+complete -c nl -l version -d 'output version information and exit'
diff --git a/share/completions/nm.fish b/share/completions/nm.fish
index eb9909817..ca94b5e59 100644
--- a/share/completions/nm.fish
+++ b/share/completions/nm.fish
@@ -4,26 +4,26 @@ complete -c nm -s A -l print-file-name -d 'Print name of the input file before e
 #                     Same as --format=bsd
 #                     The STYLE, if specified, can be `auto' (the default),
 #                    `gnu', `lucid', `arm', `hp', `edg', `gnu-v3', `java' or `gnat'
-complete -c nm      -l no-demangle       -d 'Do not demangle low-level symbol names'
-complete -c nm -s D -l dynamic           -d 'Display dynamic symbols instead of normal symbols'
-complete -c nm      -l defined-only      -d 'Display only defined symbols'
-complete -c nm -s f -l format            -d 'Use the output format FORMAT. The default is "bsd"' -a 'bsd sysv posix'
-complete -c nm -s g -l extern-only       -d 'Display only external symbols'
-complete -c nm -s l -l line-numbers      -d 'Use debugging information to find a filename and line number for each symbol'
-complete -c nm -s n -l numeric-sort      -d 'Sort symbols numerically by address'
-complete -c nm -s o                      -d 'Print name of the input file before every symbol'
-complete -c nm -s p -l no-sort           -d 'Do not sort the symbols'
-complete -c nm -s P -l portability       -d 'Same as --format=posix'
-complete -c nm -s r -l reverse-sort      -d 'Reverse the sense of the sort'
-complete -c nm      -l plugin            -d 'Load the specified plugin'
-complete -c nm -s S -l print-size        -d 'Print size of defined symbols'
-complete -c nm -s s -l print-armap       -d 'Include index for symbols from archive members'
-complete -c nm      -l size-sort         -d 'Sort symbols by size'
-complete -c nm      -l special-syms      -d 'Include special symbols in the output'
-complete -c nm      -l synthetic         -d 'Display synthetic symbols as well'
-complete -c nm -s t -l radix             -d 'Use RADIX for printing symbol values'
-complete -c nm      -l target            -d 'Specify the target object format as BFDNAME'
-complete -c nm -s u -l undefined-only    -d 'Display only undefined symbols'
-complete -c nm -s h -l help              -d 'Display this information'
-complete -c nm -s V -l version           -d "Display this program's version number"
+complete -c nm -l no-demangle -d 'Do not demangle low-level symbol names'
+complete -c nm -s D -l dynamic -d 'Display dynamic symbols instead of normal symbols'
+complete -c nm -l defined-only -d 'Display only defined symbols'
+complete -c nm -s f -l format -d 'Use the output format FORMAT. The default is "bsd"' -a 'bsd sysv posix'
+complete -c nm -s g -l extern-only -d 'Display only external symbols'
+complete -c nm -s l -l line-numbers -d 'Use debugging information to find a filename and line number for each symbol'
+complete -c nm -s n -l numeric-sort -d 'Sort symbols numerically by address'
+complete -c nm -s o -d 'Print name of the input file before every symbol'
+complete -c nm -s p -l no-sort -d 'Do not sort the symbols'
+complete -c nm -s P -l portability -d 'Same as --format=posix'
+complete -c nm -s r -l reverse-sort -d 'Reverse the sense of the sort'
+complete -c nm -l plugin -d 'Load the specified plugin'
+complete -c nm -s S -l print-size -d 'Print size of defined symbols'
+complete -c nm -s s -l print-armap -d 'Include index for symbols from archive members'
+complete -c nm -l size-sort -d 'Sort symbols by size'
+complete -c nm -l special-syms -d 'Include special symbols in the output'
+complete -c nm -l synthetic -d 'Display synthetic symbols as well'
+complete -c nm -s t -l radix -d 'Use RADIX for printing symbol values'
+complete -c nm -l target -d 'Specify the target object format as BFDNAME'
+complete -c nm -s u -l undefined-only -d 'Display only undefined symbols'
+complete -c nm -s h -l help -d 'Display this information'
+complete -c nm -s V -l version -d "Display this program's version number"
 
diff --git a/share/completions/node.fish b/share/completions/node.fish
index efc983f94..8acc35d45 100644
--- a/share/completions/node.fish
+++ b/share/completions/node.fish
@@ -18,170 +18,170 @@ complete -c node -l throw-deprecation -d 'Throw errors on deprecations'
 complete -c node -l v8-options -d 'Print v8 command line options'
 complete -c node -l max-stack-size -d 'Set max v8 stack size (bytes)'
 complete -c node -l use_strict -d 'enforce strict mode. type: bool default: false'
-complete -c node -l  es5_readonly -d 'activate correct semantics for inheriting readonliness. type: bool default: false'
-complete -c node -l  es52_globals -d 'activate new semantics for global var declarations. type: bool default: false'
-complete -c node -l  harmony_typeof -d 'enable harmony semantics for typeof. type: bool default: false'
-complete -c node -l  harmony_scoping -d 'enable harmony block scoping. type: bool default: false'
-complete -c node -l  harmony_modules -d 'enable harmony modules (implies block scoping). type: bool default: false'
-complete -c node -l  harmony_proxies -d 'enable harmony proxies. type: bool default: false'
-complete -c node -l  harmony_collections -d 'enable harmony collections (sets, maps, and weak maps). type: bool default: false'
-complete -c node -l  harmony -d 'enable all harmony features (except typeof). type: bool default: false'
-complete -c node -l  packed_arrays -d 'optimizes arrays that have no holes. type: bool default: false'
-complete -c node -l  smi_only_arrays -d 'tracks arrays with only smi values. type: bool default: true'
-complete -c node -l  clever_optimizations -d 'Optimize object size, Array shift, DOM strings and string +. type: bool default: true'
-complete -c node -l  unbox_double_arrays -d 'automatically unbox arrays of doubles. type: bool default: true'
-complete -c node -l  string_slices -d 'use string slices. type: bool default: true'
-complete -c node -l  crankshaft -d 'use crankshaft. type: bool default: true'
-complete -c node -l  hydrogen_filter -d 'optimization filter. type: string default:'
-complete -c node -l  use_range -d 'use hydrogen range analysis. type: bool default: true'
-complete -c node -l  eliminate_dead_phis -d 'eliminate dead phis. type: bool default: true'
-complete -c node -l  use_gvn -d 'use hydrogen global value numbering. type: bool default: true'
-complete -c node -l  use_canonicalizing -d 'use hydrogen instruction canonicalizing. type: bool default: true'
-complete -c node -l  use_inlining -d 'use function inlining. type: bool default: true'
-complete -c node -l  max_inlined_source_size -d 'maximum source size in bytes considered for a single inlining. type: int default: 600'
-complete -c node -l  max_inlined_nodes -d 'maximum number of AST nodes considered for a single inlining. type: int default: 196'
-complete -c node -l  max_inlined_nodes_cumulative -d 'maximum cumulative number of AST nodes considered for inlining. type: int default: 196'
-complete -c node -l  loop_invariant_code_motion -d 'loop invariant code motion. type: bool default: true'
-complete -c node -l  collect_megamorphic_maps_from_stub_cache -d 'crankshaft harvests type feedback from stub cache. type: bool default: true'
-complete -c node -l  hydrogen_stats -d 'print statistics for hydrogen. type: bool default: false'
-complete -c node -l  trace_hydrogen -d 'trace generated hydrogen to file. type: bool default: false'
-complete -c node -l  trace_phase -d 'trace generated IR for specified phases. type: string default: Z'
-complete -c node -l  trace_inlining -d 'trace inlining decisions. type: bool default: false'
-complete -c node -l  trace_alloc -d 'trace register allocator. type: bool default: false'
-complete -c node -l  trace_all_uses -d 'trace all use positions. type: bool default: false'
-complete -c node -l  trace_range -d 'trace range analysis. type: bool default: false'
-complete -c node -l  trace_gvn -d 'trace global value numbering. type: bool default: false'
-complete -c node -l  trace_representation -d 'trace representation types. type: bool default: false'
-complete -c node -l  stress_pointer_maps -d 'pointer map for every instruction. type: bool default: false'
-complete -c node -l  stress_environments -d 'environment for every instruction. type: bool default: false'
-complete -c node -l  deopt_every_n_times -d 'deoptimize every n times a deopt point is passed. type: int default: 0'
-complete -c node -l  trap_on_deopt -d 'put a break point before deoptimizing. type: bool default: false'
-complete -c node -l  deoptimize_uncommon_cases -d 'deoptimize uncommon cases. type: bool default: true'
-complete -c node -l  polymorphic_inlining -d 'polymorphic inlining. type: bool default: true'
-complete -c node -l  use_osr -d 'use on-stack replacement. type: bool default: true'
-complete -c node -l  array_bounds_checks_elimination -d 'perform array bounds checks elimination. type: bool default: false'
-complete -c node -l  array_index_dehoisting -d 'perform array index dehoisting. type: bool default: false'
-complete -c node -l  trace_osr -d 'trace on-stack replacement. type: bool default: false'
-complete -c node -l  stress_runs -d 'number of stress runs. type: int default: 0'
-complete -c node -l  optimize_closures -d 'optimize closures. type: bool default: true'
-complete -c node -l  inline_construct -d 'inline constructor calls. type: bool default: true'
-complete -c node -l  inline_arguments -d 'inline functions with arguments object. type: bool default: true'
-complete -c node -l  loop_weight -d 'loop weight for representation inference. type: int default: 1'
-complete -c node -l  optimize_for_in -d 'optimize functions containing for-in loops. type: bool default: true'
-complete -c node -l  experimental_profiler -d 'enable all profiler experiments. type: bool default: true'
-complete -c node -l  watch_ic_patching -d 'profiler considers IC stability. type: bool default: false'
-complete -c node -l  frame_count -d 'number of stack frames inspected by the profiler. type: int default: 1'
-complete -c node -l  self_optimization -d 'primitive functions trigger their own optimization. type: bool default: false'
-complete -c node -l  direct_self_opt -d 'call recompile stub directly when self-optimizing. type: bool default: false'
-complete -c node -l  retry_self_opt -d 're-try self-optimization if it failed. type: bool default: false'
-complete -c node -l  count_based_interrupts -d 'trigger profiler ticks based on counting instead of timing. type: bool default: false'
-complete -c node -l  interrupt_at_exit -d 'insert an interrupt check at function exit. type: bool default: false'
-complete -c node -l  weighted_back_edges -d 'weight back edges by jump distance for interrupt triggering. type: bool default: false'
-complete -c node -l  interrupt_budget -d 'execution budget before interrupt is triggered. type: int default: 5900'
-complete -c node -l  type_info_threshold -d 'percentage of ICs that must have type info to allow optimization. type: int default: 15'
-complete -c node -l  self_opt_count -d 'call count before self-optimization. type: int default: 130'
-complete -c node -l  trace_opt_verbose -d 'extra verbose compilation tracing. type: bool default: false'
-complete -c node -l  debug_code -d 'generate extra code (assertions) for debugging. type: bool default: false'
-complete -c node -l  code_comments -d 'emit comments in code disassembly. type: bool default: false'
-complete -c node -l  enable_sse2 -d 'enable use of SSE2 instructions if available. type: bool default: true'
-complete -c node -l  enable_sse3 -d 'enable use of SSE3 instructions if available. type: bool default: true'
-complete -c node -l  enable_sse4_1 -d 'enable use of SSE4'
+complete -c node -l es5_readonly -d 'activate correct semantics for inheriting readonliness. type: bool default: false'
+complete -c node -l es52_globals -d 'activate new semantics for global var declarations. type: bool default: false'
+complete -c node -l harmony_typeof -d 'enable harmony semantics for typeof. type: bool default: false'
+complete -c node -l harmony_scoping -d 'enable harmony block scoping. type: bool default: false'
+complete -c node -l harmony_modules -d 'enable harmony modules (implies block scoping). type: bool default: false'
+complete -c node -l harmony_proxies -d 'enable harmony proxies. type: bool default: false'
+complete -c node -l harmony_collections -d 'enable harmony collections (sets, maps, and weak maps). type: bool default: false'
+complete -c node -l harmony -d 'enable all harmony features (except typeof). type: bool default: false'
+complete -c node -l packed_arrays -d 'optimizes arrays that have no holes. type: bool default: false'
+complete -c node -l smi_only_arrays -d 'tracks arrays with only smi values. type: bool default: true'
+complete -c node -l clever_optimizations -d 'Optimize object size, Array shift, DOM strings and string +. type: bool default: true'
+complete -c node -l unbox_double_arrays -d 'automatically unbox arrays of doubles. type: bool default: true'
+complete -c node -l string_slices -d 'use string slices. type: bool default: true'
+complete -c node -l crankshaft -d 'use crankshaft. type: bool default: true'
+complete -c node -l hydrogen_filter -d 'optimization filter. type: string default:'
+complete -c node -l use_range -d 'use hydrogen range analysis. type: bool default: true'
+complete -c node -l eliminate_dead_phis -d 'eliminate dead phis. type: bool default: true'
+complete -c node -l use_gvn -d 'use hydrogen global value numbering. type: bool default: true'
+complete -c node -l use_canonicalizing -d 'use hydrogen instruction canonicalizing. type: bool default: true'
+complete -c node -l use_inlining -d 'use function inlining. type: bool default: true'
+complete -c node -l max_inlined_source_size -d 'maximum source size in bytes considered for a single inlining. type: int default: 600'
+complete -c node -l max_inlined_nodes -d 'maximum number of AST nodes considered for a single inlining. type: int default: 196'
+complete -c node -l max_inlined_nodes_cumulative -d 'maximum cumulative number of AST nodes considered for inlining. type: int default: 196'
+complete -c node -l loop_invariant_code_motion -d 'loop invariant code motion. type: bool default: true'
+complete -c node -l collect_megamorphic_maps_from_stub_cache -d 'crankshaft harvests type feedback from stub cache. type: bool default: true'
+complete -c node -l hydrogen_stats -d 'print statistics for hydrogen. type: bool default: false'
+complete -c node -l trace_hydrogen -d 'trace generated hydrogen to file. type: bool default: false'
+complete -c node -l trace_phase -d 'trace generated IR for specified phases. type: string default: Z'
+complete -c node -l trace_inlining -d 'trace inlining decisions. type: bool default: false'
+complete -c node -l trace_alloc -d 'trace register allocator. type: bool default: false'
+complete -c node -l trace_all_uses -d 'trace all use positions. type: bool default: false'
+complete -c node -l trace_range -d 'trace range analysis. type: bool default: false'
+complete -c node -l trace_gvn -d 'trace global value numbering. type: bool default: false'
+complete -c node -l trace_representation -d 'trace representation types. type: bool default: false'
+complete -c node -l stress_pointer_maps -d 'pointer map for every instruction. type: bool default: false'
+complete -c node -l stress_environments -d 'environment for every instruction. type: bool default: false'
+complete -c node -l deopt_every_n_times -d 'deoptimize every n times a deopt point is passed. type: int default: 0'
+complete -c node -l trap_on_deopt -d 'put a break point before deoptimizing. type: bool default: false'
+complete -c node -l deoptimize_uncommon_cases -d 'deoptimize uncommon cases. type: bool default: true'
+complete -c node -l polymorphic_inlining -d 'polymorphic inlining. type: bool default: true'
+complete -c node -l use_osr -d 'use on-stack replacement. type: bool default: true'
+complete -c node -l array_bounds_checks_elimination -d 'perform array bounds checks elimination. type: bool default: false'
+complete -c node -l array_index_dehoisting -d 'perform array index dehoisting. type: bool default: false'
+complete -c node -l trace_osr -d 'trace on-stack replacement. type: bool default: false'
+complete -c node -l stress_runs -d 'number of stress runs. type: int default: 0'
+complete -c node -l optimize_closures -d 'optimize closures. type: bool default: true'
+complete -c node -l inline_construct -d 'inline constructor calls. type: bool default: true'
+complete -c node -l inline_arguments -d 'inline functions with arguments object. type: bool default: true'
+complete -c node -l loop_weight -d 'loop weight for representation inference. type: int default: 1'
+complete -c node -l optimize_for_in -d 'optimize functions containing for-in loops. type: bool default: true'
+complete -c node -l experimental_profiler -d 'enable all profiler experiments. type: bool default: true'
+complete -c node -l watch_ic_patching -d 'profiler considers IC stability. type: bool default: false'
+complete -c node -l frame_count -d 'number of stack frames inspected by the profiler. type: int default: 1'
+complete -c node -l self_optimization -d 'primitive functions trigger their own optimization. type: bool default: false'
+complete -c node -l direct_self_opt -d 'call recompile stub directly when self-optimizing. type: bool default: false'
+complete -c node -l retry_self_opt -d 're-try self-optimization if it failed. type: bool default: false'
+complete -c node -l count_based_interrupts -d 'trigger profiler ticks based on counting instead of timing. type: bool default: false'
+complete -c node -l interrupt_at_exit -d 'insert an interrupt check at function exit. type: bool default: false'
+complete -c node -l weighted_back_edges -d 'weight back edges by jump distance for interrupt triggering. type: bool default: false'
+complete -c node -l interrupt_budget -d 'execution budget before interrupt is triggered. type: int default: 5900'
+complete -c node -l type_info_threshold -d 'percentage of ICs that must have type info to allow optimization. type: int default: 15'
+complete -c node -l self_opt_count -d 'call count before self-optimization. type: int default: 130'
+complete -c node -l trace_opt_verbose -d 'extra verbose compilation tracing. type: bool default: false'
+complete -c node -l debug_code -d 'generate extra code (assertions) for debugging. type: bool default: false'
+complete -c node -l code_comments -d 'emit comments in code disassembly. type: bool default: false'
+complete -c node -l enable_sse2 -d 'enable use of SSE2 instructions if available. type: bool default: true'
+complete -c node -l enable_sse3 -d 'enable use of SSE3 instructions if available. type: bool default: true'
+complete -c node -l enable_sse4_1 -d 'enable use of SSE4'
 complete -c node -l enable_cmov -d 'enable use of CMOV instruction if available. type: bool default: true'
-complete -c node -l  enable_rdtsc -d 'enable use of RDTSC instruction if available. type: bool default: true'
-complete -c node -l  enable_sahf -d 'enable use of SAHF instruction if available (X64 only). type: bool default: true'
-complete -c node -l  enable_vfp3 -d 'enable use of VFP3 instructions if available - this implies enabling ARMv7 instructions (ARM only). type: bool default: true'
-complete -c node -l  enable_armv7 -d 'enable use of ARMv7 instructions if available (ARM only). type: bool default: true'
-complete -c node -l  enable_fpu -d 'enable use of MIPS FPU instructions if available (MIPS only). type: bool default: true'
-complete -c node -l  expose_natives_as -d 'expose natives in global object. type: string default: NULL'
-complete -c node -l  expose_debug_as -d 'expose debug in global object. type: string default: NULL'
-complete -c node -l  expose_gc -d 'expose gc extension. type: bool default: false'
-complete -c node -l  expose_externalize_string -d 'expose externalize string extension. type: bool default: false'
-complete -c node -l  stack_trace_limit -d 'number of stack frames to capture. type: int default: 10'
-complete -c node -l  builtins_in_stack_traces -d 'show built-in functions in stack traces. type: bool default: false'
-complete -c node -l  disable_native_files -d 'disable builtin natives files. type: bool default: false'
-complete -c node -l  inline_new -d 'use fast inline allocation. type: bool default: true'
-complete -c node -l  stack_trace_on_abort -d 'print a stack trace if an assertion failure occurs. type: bool default: true'
-complete -c node -l  trace -d 'trace function calls. type: bool default: false'
-complete -c node -l  mask_constants_with_cookie -d 'use random jit cookie to mask large constants. type: bool default: true'
-complete -c node -l  lazy -d 'use lazy compilation. type: bool default: true'
-complete -c node -l  trace_opt -d 'trace lazy optimization. type: bool default: false'
-complete -c node -l  trace_opt_stats -d 'trace lazy optimization statistics. type: bool default: false'
-complete -c node -l  opt -d 'use adaptive optimizations. type: bool default: true'
-complete -c node -l  always_opt -d 'always try to optimize functions. type: bool default: false'
-complete -c node -l  prepare_always_opt -d 'prepare for turning on always opt. type: bool default: false'
-complete -c node -l  trace_deopt -d 'trace deoptimization. type: bool default: false'
-complete -c node -l  min_preparse_length -d 'minimum length for automatic enable preparsing. type: int default: 1024'
-complete -c node -l  always_full_compiler -d 'try to use the dedicated run-once backend for all code. type: bool default: false'
-complete -c node -l  trace_bailout -d 'print reasons for falling back to using the classic V8 backend. type: bool default: false'
-complete -c node -l  compilation_cache -d 'enable compilation cache. type: bool default: true'
-complete -c node -l  cache_prototype_transitions -d 'cache prototype transitions. type: bool default: true'
-complete -c node -l  trace_debug_json -d 'trace debugging JSON request/response. type: bool default: false'
-complete -c node -l  debugger_auto_break -d 'automatically set the debug break flag when debugger commands are in the queue. type: bool default: true'
-complete -c node -l  enable_liveedit -d 'enable liveedit experimental feature. type: bool default: true'
-complete -c node -l  break_on_abort -d 'always cause a debug break before aborting. type: bool default: true'
-complete -c node -l  stack_size -d 'default size of stack region v8 is allowed to use (in kBytes). type: int default: 984'
-complete -c node -l  max_stack_trace_source_length -d 'maximum length of function source code printed in a stack trace'
+complete -c node -l enable_rdtsc -d 'enable use of RDTSC instruction if available. type: bool default: true'
+complete -c node -l enable_sahf -d 'enable use of SAHF instruction if available (X64 only). type: bool default: true'
+complete -c node -l enable_vfp3 -d 'enable use of VFP3 instructions if available - this implies enabling ARMv7 instructions (ARM only). type: bool default: true'
+complete -c node -l enable_armv7 -d 'enable use of ARMv7 instructions if available (ARM only). type: bool default: true'
+complete -c node -l enable_fpu -d 'enable use of MIPS FPU instructions if available (MIPS only). type: bool default: true'
+complete -c node -l expose_natives_as -d 'expose natives in global object. type: string default: NULL'
+complete -c node -l expose_debug_as -d 'expose debug in global object. type: string default: NULL'
+complete -c node -l expose_gc -d 'expose gc extension. type: bool default: false'
+complete -c node -l expose_externalize_string -d 'expose externalize string extension. type: bool default: false'
+complete -c node -l stack_trace_limit -d 'number of stack frames to capture. type: int default: 10'
+complete -c node -l builtins_in_stack_traces -d 'show built-in functions in stack traces. type: bool default: false'
+complete -c node -l disable_native_files -d 'disable builtin natives files. type: bool default: false'
+complete -c node -l inline_new -d 'use fast inline allocation. type: bool default: true'
+complete -c node -l stack_trace_on_abort -d 'print a stack trace if an assertion failure occurs. type: bool default: true'
+complete -c node -l trace -d 'trace function calls. type: bool default: false'
+complete -c node -l mask_constants_with_cookie -d 'use random jit cookie to mask large constants. type: bool default: true'
+complete -c node -l lazy -d 'use lazy compilation. type: bool default: true'
+complete -c node -l trace_opt -d 'trace lazy optimization. type: bool default: false'
+complete -c node -l trace_opt_stats -d 'trace lazy optimization statistics. type: bool default: false'
+complete -c node -l opt -d 'use adaptive optimizations. type: bool default: true'
+complete -c node -l always_opt -d 'always try to optimize functions. type: bool default: false'
+complete -c node -l prepare_always_opt -d 'prepare for turning on always opt. type: bool default: false'
+complete -c node -l trace_deopt -d 'trace deoptimization. type: bool default: false'
+complete -c node -l min_preparse_length -d 'minimum length for automatic enable preparsing. type: int default: 1024'
+complete -c node -l always_full_compiler -d 'try to use the dedicated run-once backend for all code. type: bool default: false'
+complete -c node -l trace_bailout -d 'print reasons for falling back to using the classic V8 backend. type: bool default: false'
+complete -c node -l compilation_cache -d 'enable compilation cache. type: bool default: true'
+complete -c node -l cache_prototype_transitions -d 'cache prototype transitions. type: bool default: true'
+complete -c node -l trace_debug_json -d 'trace debugging JSON request/response. type: bool default: false'
+complete -c node -l debugger_auto_break -d 'automatically set the debug break flag when debugger commands are in the queue. type: bool default: true'
+complete -c node -l enable_liveedit -d 'enable liveedit experimental feature. type: bool default: true'
+complete -c node -l break_on_abort -d 'always cause a debug break before aborting. type: bool default: true'
+complete -c node -l stack_size -d 'default size of stack region v8 is allowed to use (in kBytes). type: int default: 984'
+complete -c node -l max_stack_trace_source_length -d 'maximum length of function source code printed in a stack trace'
 complete -c node -l always_inline_smi_code -d 'always inline smi code in non-opt code. type: bool default: false'
-complete -c node -l  max_new_space_size -d 'max size of the new generation (in kBytes). type: int default: 0'
-complete -c node -l  max_old_space_size -d 'max size of the old generation (in Mbytes). type: int default: 0'
-complete -c node -l  max_executable_size -d 'max size of executable memory (in Mbytes). type: int default: 0'
-complete -c node -l  gc_global -d 'always perform global GCs. type: bool default: false'
-complete -c node -l  gc_interval -d 'garbage collect after <n> allocations. type: int default: -1'
-complete -c node -l  trace_gc -d 'print one trace line following each garbage collection. type: bool default: false'
-complete -c node -l  trace_gc_nvp -d 'print one detailed trace line in name=value format after each garbage collection. type: bool default: false'
-complete -c node -l  print_cumulative_gc_stat -d 'print cumulative GC statistics in name=value format on exit. type: bool default: false'
-complete -c node -l  trace_gc_verbose -d 'print more details following each garbage collection. type: bool default: false'
-complete -c node -l  trace_fragmentation -d 'report fragmentation for old pointer and data pages. type: bool default: false'
-complete -c node -l  collect_maps -d 'garbage collect maps from which no objects can be reached. type: bool default: true'
-complete -c node -l  flush_code -d 'flush code that we expect not to use again before full gc. type: bool default: true'
-complete -c node -l  incremental_marking -d 'use incremental marking. type: bool default: true'
-complete -c node -l  incremental_marking_steps -d 'do incremental marking steps. type: bool default: true'
-complete -c node -l  trace_incremental_marking -d 'trace progress of the incremental marking. type: bool default: false'
-complete -c node -l  use_idle_notification -d 'Use idle notification to reduce memory footprint'
+complete -c node -l max_new_space_size -d 'max size of the new generation (in kBytes). type: int default: 0'
+complete -c node -l max_old_space_size -d 'max size of the old generation (in Mbytes). type: int default: 0'
+complete -c node -l max_executable_size -d 'max size of executable memory (in Mbytes). type: int default: 0'
+complete -c node -l gc_global -d 'always perform global GCs. type: bool default: false'
+complete -c node -l gc_interval -d 'garbage collect after <n> allocations. type: int default: -1'
+complete -c node -l trace_gc -d 'print one trace line following each garbage collection. type: bool default: false'
+complete -c node -l trace_gc_nvp -d 'print one detailed trace line in name=value format after each garbage collection. type: bool default: false'
+complete -c node -l print_cumulative_gc_stat -d 'print cumulative GC statistics in name=value format on exit. type: bool default: false'
+complete -c node -l trace_gc_verbose -d 'print more details following each garbage collection. type: bool default: false'
+complete -c node -l trace_fragmentation -d 'report fragmentation for old pointer and data pages. type: bool default: false'
+complete -c node -l collect_maps -d 'garbage collect maps from which no objects can be reached. type: bool default: true'
+complete -c node -l flush_code -d 'flush code that we expect not to use again before full gc. type: bool default: true'
+complete -c node -l incremental_marking -d 'use incremental marking. type: bool default: true'
+complete -c node -l incremental_marking_steps -d 'do incremental marking steps. type: bool default: true'
+complete -c node -l trace_incremental_marking -d 'trace progress of the incremental marking. type: bool default: false'
+complete -c node -l use_idle_notification -d 'Use idle notification to reduce memory footprint'
 complete -c node -l send_idle_notification -d 'Send idle notification between stress runs'
 complete -c node -l use_ic -d 'use inline caching. type: bool default: true'
-complete -c node -l  native_code_counters -d 'generate extra code for manipulating stats counters. type: bool default: false'
-complete -c node -l  always_compact -d 'Perform compaction on every full GC. type: bool default: false'
-complete -c node -l  lazy_sweeping -d 'Use lazy sweeping for old pointer and data spaces. type: bool default: true'
-complete -c node -l  never_compact -d 'Never perform compaction on full GC - testing only. type: bool default: false'
-complete -c node -l  compact_code_space -d 'Compact code space on full non-incremental collections. type: bool default: true'
-complete -c node -l  cleanup_code_caches_at_gc -d 'Flush inline caches prior to mark compact collection and flush code caches in maps during mark compact cycle'
+complete -c node -l native_code_counters -d 'generate extra code for manipulating stats counters. type: bool default: false'
+complete -c node -l always_compact -d 'Perform compaction on every full GC. type: bool default: false'
+complete -c node -l lazy_sweeping -d 'Use lazy sweeping for old pointer and data spaces. type: bool default: true'
+complete -c node -l never_compact -d 'Never perform compaction on full GC - testing only. type: bool default: false'
+complete -c node -l compact_code_space -d 'Compact code space on full non-incremental collections. type: bool default: true'
+complete -c node -l cleanup_code_caches_at_gc -d 'Flush inline caches prior to mark compact collection and flush code caches in maps during mark compact cycle'
 complete -c node -l random_seed -d 'Default seed for initializing random generator (0, the default, means to use system random)'
 complete -c node -l use_verbose_printer -d 'allows verbose printing. type: bool default: true'
-complete -c node -l  allow_natives_syntax -d 'allow natives syntax. type: bool default: false'
-complete -c node -l  trace_sim -d 'Trace simulator execution. type: bool default: false'
-complete -c node -l  check_icache -d 'Check icache flushes in ARM and MIPS simulator. type: bool default: false'
-complete -c node -l  stop_sim_at -d 'Simulator stop after x number of instructions. type: int default: 0'
-complete -c node -l  sim_stack_alignment -d 'Stack alignment in bytes in simulator (4 or 8, 8 is default). type: int default: 8'
-complete -c node -l  trace_exception -d 'print stack trace when throwing exceptions. type: bool default: false'
-complete -c node -l  preallocate_message_memory -d 'preallocate some memory to build stack traces'
+complete -c node -l allow_natives_syntax -d 'allow natives syntax. type: bool default: false'
+complete -c node -l trace_sim -d 'Trace simulator execution. type: bool default: false'
+complete -c node -l check_icache -d 'Check icache flushes in ARM and MIPS simulator. type: bool default: false'
+complete -c node -l stop_sim_at -d 'Simulator stop after x number of instructions. type: int default: 0'
+complete -c node -l sim_stack_alignment -d 'Stack alignment in bytes in simulator (4 or 8, 8 is default). type: int default: 8'
+complete -c node -l trace_exception -d 'print stack trace when throwing exceptions. type: bool default: false'
+complete -c node -l preallocate_message_memory -d 'preallocate some memory to build stack traces'
 complete -c node -l randomize_hashes -d 'randomize hashes to avoid predictable hash collisions (with snapshots this option cannot override the baked-in seed). type: bool default: true'
-complete -c node -l  hash_seed -d 'Fixed seed to use to hash property keys (0 means random) (with snapshots this option cannot override the baked-in seed). type: int default: 0'
-complete -c node -l  preemption -d 'activate a 100ms timer that switches between V8 threads. type: bool default: false'
-complete -c node -l  regexp_optimization -d 'generate optimized regexp code. type: bool default: true'
-complete -c node -l  testing_bool_flag -d 'testing_bool_flag. type: bool default: true'
-complete -c node -l  testing_int_flag -d 'testing_int_flag. type: int default: 13'
-complete -c node -l  testing_float_flag -d 'float-flag. type: float default: 2'
+complete -c node -l hash_seed -d 'Fixed seed to use to hash property keys (0 means random) (with snapshots this option cannot override the baked-in seed). type: int default: 0'
+complete -c node -l preemption -d 'activate a 100ms timer that switches between V8 threads. type: bool default: false'
+complete -c node -l regexp_optimization -d 'generate optimized regexp code. type: bool default: true'
+complete -c node -l testing_bool_flag -d 'testing_bool_flag. type: bool default: true'
+complete -c node -l testing_int_flag -d 'testing_int_flag. type: int default: 13'
+complete -c node -l testing_float_flag -d 'float-flag. type: float default: 2'
 complete -c node -l testing_string_flag -d 'string-flag. type: string default: Hello, world!'
-complete -c node -l  testing_prng_seed -d 'Seed used for threading test randomness. type: int default: 42'
-complete -c node -l  testing_serialization_file -d 'file in which to serialize heap. type: string default: /tmp/serdes'
-complete -c node -l  help -d 'Print usage message, including flags, on console. type: bool default: true'
-complete -c node -l  dump_counters -d 'Dump counters on exit. type: bool default: false'
-complete -c node -l  debugger -d 'Enable JavaScript debugger. type: bool default: false'
-complete -c node -l  remote_debugger -d 'Connect JavaScript debugger to the debugger agent in another process. type: bool default: false'
-complete -c node -l  debugger_agent -d 'Enable debugger agent. type: bool default: false'
-complete -c node -l  debugger_port -d 'Port to use for remote debugging. type: int default: 5858'
-complete -c node -l  map_counters -d 'Map counters to a file. type: string default:'
-complete -c node -l  js_arguments -d 'Pass all remaining arguments to the script'
+complete -c node -l testing_prng_seed -d 'Seed used for threading test randomness. type: int default: 42'
+complete -c node -l testing_serialization_file -d 'file in which to serialize heap. type: string default: /tmp/serdes'
+complete -c node -l help -d 'Print usage message, including flags, on console. type: bool default: true'
+complete -c node -l dump_counters -d 'Dump counters on exit. type: bool default: false'
+complete -c node -l debugger -d 'Enable JavaScript debugger. type: bool default: false'
+complete -c node -l remote_debugger -d 'Connect JavaScript debugger to the debugger agent in another process. type: bool default: false'
+complete -c node -l debugger_agent -d 'Enable debugger agent. type: bool default: false'
+complete -c node -l debugger_port -d 'Port to use for remote debugging. type: int default: 5858'
+complete -c node -l map_counters -d 'Map counters to a file. type: string default:'
+complete -c node -l js_arguments -d 'Pass all remaining arguments to the script'
 complete -c node -l debug_compile_events -d 'Enable debugger compile events. type: bool default: true'
-complete -c node -l  debug_script_collected_events -d 'Enable debugger script collected events. type: bool default: true'
-complete -c node -l  gdbjit -d 'enable GDBJIT interface (disables compacting GC). type: bool default: false'
-complete -c node -l  gdbjit_full -d 'enable GDBJIT interface for all code objects. type: bool default: false'
-complete -c node -l  gdbjit_dump -d 'dump elf objects with debug info to disk. type: bool default: false'
-complete -c node -l  gdbjit_dump_filter -d 'dump only objects containing this substring. type: string default:'
-complete -c node -l  force_marking_deque_overflows -d 'force overflows of marking deque by reducing its size to 64 words. type: bool default: false'
-complete -c node -l  stress_compaction -d 'stress the GC compactor to flush out bugs (implies --force_marking_deque_overflows). type: bool default: false'
-complete -c node -l  log -d 'Minimal logging (no API, code, GC, suspect, or handles samples)'
+complete -c node -l debug_script_collected_events -d 'Enable debugger script collected events. type: bool default: true'
+complete -c node -l gdbjit -d 'enable GDBJIT interface (disables compacting GC). type: bool default: false'
+complete -c node -l gdbjit_full -d 'enable GDBJIT interface for all code objects. type: bool default: false'
+complete -c node -l gdbjit_dump -d 'dump elf objects with debug info to disk. type: bool default: false'
+complete -c node -l gdbjit_dump_filter -d 'dump only objects containing this substring. type: string default:'
+complete -c node -l force_marking_deque_overflows -d 'force overflows of marking deque by reducing its size to 64 words. type: bool default: false'
+complete -c node -l stress_compaction -d 'stress the GC compactor to flush out bugs (implies --force_marking_deque_overflows). type: bool default: false'
+complete -c node -l log -d 'Minimal logging (no API, code, GC, suspect, or handles samples)'
 complete -c node -l log_all -d 'Log all events to the log file'
 complete -c node -l log_runtime -d 'Activate runtime system %Log call'
 complete -c node -l log_api -d 'Log API events to the log file'
@@ -192,7 +192,7 @@ complete -c node -l log_snapshot_positions -d 'log positions of (de)serialized o
 complete -c node -l log_suspect -d 'Log suspect operations'
 complete -c node -l prof -d 'Log statistical profiling information (implies --log-code)'
 complete -c node -l prof_auto -d 'Used with --prof, starts profiling automatically) type: bool default: true'
-complete -c node -l  prof_lazy -d 'Used with --prof, only does sampling and logging when profiler is active (implies --noprof_auto)'
+complete -c node -l prof_lazy -d 'Used with --prof, only does sampling and logging when profiler is active (implies --noprof_auto)'
 complete -c node -l prof_browser_mode -d 'Used with --prof, turns on browser-compatible mode for profiling'
 complete -c node -l log_regexp -d 'Log regular expression execution'
 complete -c node -l sliding_state_window -d 'Update sliding state window counters'
diff --git a/share/completions/npm.fish b/share/completions/npm.fish
index 607215086..68e8b8f3d 100644
--- a/share/completions/npm.fish
+++ b/share/completions/npm.fish
@@ -114,13 +114,13 @@ complete -f -c npm -n '__fish_npm_using_command cache' -a 'ls' -d 'Show the data
 
 # config
 for c in 'c' 'config'
-  complete -f -c npm -n "__fish_npm_needs_command" -a "$c" -d 'Manage the npm configuration files'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'set' -d 'Sets the config key to the value'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'get' -d 'Echo the config value to stdout'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'delete' -d 'Deletes the key from all configuration files'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'list' -d 'Show all the config settings'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'ls' -d 'Show all the config settings'
-  complete -f -c npm -n "__fish_npm_using_command $c" -a 'edit' -d 'Opens the config file in an editor'
+    complete -f -c npm -n "__fish_npm_needs_command" -a "$c" -d 'Manage the npm configuration files'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'set' -d 'Sets the config key to the value'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'get' -d 'Echo the config value to stdout'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'delete' -d 'Deletes the key from all configuration files'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'list' -d 'Show all the config settings'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'ls' -d 'Show all the config settings'
+    complete -f -c npm -n "__fish_npm_using_command $c" -a 'edit' -d 'Opens the config file in an editor'
 end
 # get, set also exist as shorthands
 complete -f -c npm -n "__fish_npm_needs_command" -a 'get' -d 'Echo the config value to stdout'
@@ -136,12 +136,12 @@ end
 
 # list
 for c in 'la' 'list' 'll' 'ls'
-  complete -f -c npm -n '__fish_npm_needs_command' -a "$c" -d 'List installed packages'
-  complete -f -c npm -n "__fish_npm_using_command $c" -s g -l global -d 'List packages in the global install prefix instead of in the current project'
-  complete -f -c npm -n "__fish_npm_using_command $c" -l json -d 'Show information in JSON format'
-  complete -f -c npm -n "__fish_npm_using_command $c" -l long -d 'Show extended information'
-  complete -f -c npm -n "__fish_npm_using_command $c" -l parseable -d 'Show parseable output instead of tree view'
-  complete -x -c npm -n "__fish_npm_using_command $c" -l depth -d 'Max display depth of the dependency tree'
+    complete -f -c npm -n '__fish_npm_needs_command' -a "$c" -d 'List installed packages'
+    complete -f -c npm -n "__fish_npm_using_command $c" -s g -l global -d 'List packages in the global install prefix instead of in the current project'
+    complete -f -c npm -n "__fish_npm_using_command $c" -l json -d 'Show information in JSON format'
+    complete -f -c npm -n "__fish_npm_using_command $c" -l long -d 'Show extended information'
+    complete -f -c npm -n "__fish_npm_using_command $c" -l parseable -d 'Show parseable output instead of tree view'
+    complete -x -c npm -n "__fish_npm_using_command $c" -l depth -d 'Max display depth of the dependency tree'
 end
 
 # owner
diff --git a/share/completions/obnam.fish b/share/completions/obnam.fish
index 67a5f0e40..788722dbf 100644
--- a/share/completions/obnam.fish
+++ b/share/completions/obnam.fish
@@ -1,11 +1,11 @@
 
 function __fish_obnam_nosubcommand
-	if __fish_seen_subcommand_from add-key backup client-keys clients diff dump-repo force-lock forget fsck \
-		generations genids help help-all kdirstat list-errors list-formats list-keys list-toplevels \
-		ls mount nagios-last-backup-age remove-client remove-key restore verify
-		return 1
-	end
-	return 0
+    if __fish_seen_subcommand_from add-key backup client-keys clients diff dump-repo force-lock forget fsck \
+            generations genids help help-all kdirstat list-errors list-formats list-keys list-toplevels \
+            ls mount nagios-last-backup-age remove-client remove-key restore verify
+        return 1
+    end
+    return 0
 end
 
 complete -c obnam --no-files --condition __fish_obnam_nosubcommand -a 'add-key' -d 'Add a key to the repository'
@@ -47,38 +47,38 @@ complete -c obnam --no-files -l generation -d 'Which generation to restore'
 complete -c obnam --no-files -s h -l help -d 'Show this help message and exit'
 complete -c obnam --no-files -l keep -d 'Policy for what generations to keep when forgetting.'
 complete -c obnam --no-files -l lock-timeout -d 'Wait TIMEOUT seconds for an existing lock'
-complete -c obnam            -l output -d 'Write output to FILE instead of STDOUT'
+complete -c obnam -l output -d 'Write output to FILE instead of STDOUT'
 complete -c obnam --no-files -l pretend -l dry-run -l no-act -d 'Do not actually change anything'
 complete -c obnam --no-files -l no-pretend -l no-dry-run -l no-no-act -d 'Actually commit changes'
 complete -c obnam --no-files -l quiet -d 'Show only errors, no progress updates'
 complete -c obnam --no-files -l no-quiet -d 'Show errors and progress updates'
-complete -c obnam       -s r -l repository -d 'Name of backup repository'
+complete -c obnam -s r -l repository -d 'Name of backup repository'
 complete -c obnam --no-files -l repository-format -a '6 green-albatross-20160813' -d 'Use FORMAT for new repositories'
-complete -c obnam            -l to -d 'Where to restore / mount to'
+complete -c obnam -l to -d 'Where to restore / mount to'
 complete -c obnam --no-files -l verbose -d 'Be more verbose'
 complete -c obnam --no-files -l no-verbose -d 'Do not be verbose'
 complete -c obnam --no-files -l verify-randomly -d 'Verify N files randomly from the backup'
 complete -c obnam --no-files -l version -d 'Show version number and exit'
-complete -c obnam            -l warn-age -d 'For nagios-last-backup-age: maximum age'
+complete -c obnam -l warn-age -d 'For nagios-last-backup-age: maximum age'
 
 # Backing up
 complete -c obnam --no-files -l checkpoint -d 'Make a checkpoint after a given SIZE'
 complete -c obnam --no-files -l deduplicate -a 'fatalist never verify' -d 'Deduplicate mode'
-complete -c obnam            -l exclude -d 'REGEXP for pathnames to exclude'
+complete -c obnam -l exclude -d 'REGEXP for pathnames to exclude'
 complete -c obnam --no-files -l exclude-caches -d 'Exclude directories tagged as cache'
 complete -c obnam --no-files -l no-exclude-caches -d 'Include directories tagged as cache'
-complete -c obnam            -l exclude-from -d 'Read exclude patterns from FILE'
+complete -c obnam -l exclude-from -d 'Read exclude patterns from FILE'
 complete -c obnam --no-files -l include -d 'REGEXP for pathnames to include, even if matches --exclude'
 complete -c obnam --no-files -l leave-checkpoints -d 'Leave checkpoint generations at the end of backup'
 complete -c obnam --no-files -l no-leave-checkpoints -d 'Omit checkpoint generations at the end of backup'
 complete -c obnam --no-files -l one-file-system -d 'Do not follow mount points'
 complete -c obnam --no-files -l no-one-file-system -d 'Follow mount points'
-complete -c obnam            -l root -d 'What to backup'
+complete -c obnam -l root -d 'What to backup'
 complete -c obnam --no-files -l small-files-in-btree -d 'Put small files directly into the B-tree'
 complete -c obnam --no-files -l no-small-files-in-btree -d 'No not put small files into the B-tree'
 
 # Configuration files and settings
-complete -c obnam            -l config -d 'Add FILE to config files'
+complete -c obnam -l config -d 'Add FILE to config files'
 complete -c obnam --no-files -l dump-config -d 'Write out the current configuration'
 complete -c obnam --no-files -l dump-setting-names -d 'Write out setting names'
 complete -c obnam --no-files -l help-all -d 'Show all options'
@@ -89,11 +89,11 @@ complete -c obnam --no-files -l no-default-configs -d 'Clear list of configurati
 complete -c obnam --no-files -l crash-limit -d 'Artificially crash the program after COUNTER files'
 complete -c obnam --no-files -l pretend-time -d 'Pretend it is TIMESTAMP'
 complete -c obnam --no-files -l testing-fail-matching -d 'Simulate failures for files that match REGEXP'
-complete -c obnam            -l trace -d 'FILENAME pattern for trace debugging'
+complete -c obnam -l trace -d 'FILENAME pattern for trace debugging'
 
 # Encryption
 complete -c obnam --no-files -l encrypt-with -d 'PGP key with which to encrypt'
-complete -c obnam            -l gnupghome -d 'Home directory for GPG'
+complete -c obnam -l gnupghome -d 'Home directory for GPG'
 complete -c obnam --no-files -l key-details -d 'Show additional user IDs'
 complete -c obnam --no-files -l no-key-details -d 'Do not show additional user IDs'
 complete -c obnam --no-files -l keyid -d 'PGP key id'
@@ -125,7 +125,7 @@ complete -c obnam --no-files -l fsck-skip-shared-b-trees -d 'Do not check shared
 complete -c obnam --no-files -l no-fsck-skip-shared-b-trees -d 'Check shared B-trees'
 
 # Logging
-complete -c obnam            -l log -a 'syslog' -d 'Write log to FILE or syslog'
+complete -c obnam -l log -a 'syslog' -d 'Write log to FILE or syslog'
 complete -c obnam --no-files -l log-keep -d 'Keep last N logs (10)'
 complete -c obnam --no-files -l log-level -a 'debug info warning error critical fatal' -d 'Log at LEVEL'
 complete -c obnam --no-files -l log-max -d 'Rotate logs larger than SIZE'
@@ -157,7 +157,7 @@ complete -c obnam --no-files -l dir-cache-size -d 'In-memory cache SIZE for dir
 # SSH/SFTP
 complete -c obnam --no-files -l pure-paramiko -d 'Use only paramiko, no openssh'
 complete -c obnam --no-files -l no-pure-paramiko -d 'Use openssh if available'
-complete -c obnam            -l ssh-command -d 'Executable to be used instead of "ssh"'
+complete -c obnam -l ssh-command -d 'Executable to be used instead of "ssh"'
 complete -c obnam --no-files -l ssh-host-keys-check -a 'no yes ask ssh-config' -d 'ssh host key check'
-complete -c obnam            -l ssh-key -d 'Use FILENAME as the ssh RSA key'
-complete -c obnam            -l ssh-known-hosts -a '~/.ssh/known_hosts' -d 'FILENAME of the known_hosts file'
+complete -c obnam -l ssh-key -d 'Use FILENAME as the ssh RSA key'
+complete -c obnam -l ssh-known-hosts -a '~/.ssh/known_hosts' -d 'FILENAME of the known_hosts file'
diff --git a/share/completions/oggenc.fish b/share/completions/oggenc.fish
index 2c0a46465..6b816cb22 100644
--- a/share/completions/oggenc.fish
+++ b/share/completions/oggenc.fish
@@ -2,23 +2,23 @@
 # Completions for oggenc
 #
 complete -c oggenc -s Q -l quiet -f -d "Produce no output to stderr"
-complete -c oggenc -s h -l help  -f -d "Print this help text"
+complete -c oggenc -s h -l help -f -d "Print this help text"
 complete -c oggenc -s v -l version -f -d "Print the version number"
-complete -c oggenc -s r -l raw -f -d     "Raw mode. Input files are read directly as PCM data"
+complete -c oggenc -s r -l raw -f -d "Raw mode. Input files are read directly as PCM data"
 complete -c oggenc -s B -l raw-bits -x -d "Set bits/sample for raw input. Default is 16"
 complete -c oggenc -s C -l raw-chan -x -d "Set number of channels for raw input"
 complete -c oggenc -s R -l raw-rate -x -d "Set samples/sec for raw input"
-complete -c oggenc      -l raw-endianness -f -d "1 for bigendian, 0 for little (defaults to 0)"
+complete -c oggenc -l raw-endianness -f -d "1 for bigendian, 0 for little (defaults to 0)"
 complete -c oggenc -s b -l bitrate -x -d "Choose a nominal bitrate to encode at"
-complete -c oggenc      -l managed -f -d "Enable the bitrate management engine"
+complete -c oggenc -l managed -f -d "Enable the bitrate management engine"
 complete -c oggenc -s m -l min-bitrate -x -d "Specify a minimum bitrate (in kbps)"
 complete -c oggenc -s M -l max-bitrate -x -d "Specify a maximum bitrate in kbps"
-complete -c oggenc      -l advanced-encode-option -x -d "option=value Sets an advanced encoder option to the given value"
+complete -c oggenc -l advanced-encode-option -x -d "option=value Sets an advanced encoder option to the given value"
 complete -c oggenc -s q -l quality -x -d "Specify quality"
-complete -c oggenc      -l resample -x -d "Resample input data to sampling rate n (Hz)"
-complete -c oggenc      -l downmix -f -d  "Downmix stereo to mono"
+complete -c oggenc -l resample -x -d "Resample input data to sampling rate n (Hz)"
+complete -c oggenc -l downmix -f -d "Downmix stereo to mono"
 complete -c oggenc -s s -l serial -x -d "Specify a serial number for the stream"
-complete -c oggenc      -l discard-comments -f -d "Prevents comments in FLAC and Ogg FLAC files from being copied to the output Ogg Vorbis file"
+complete -c oggenc -l discard-comments -f -d "Prevents comments in FLAC and Ogg FLAC files from being copied to the output Ogg Vorbis file"
 complete -c oggenc -s o -l output -x -d "Write file to fn (only valid in single-file mode)"
 complete -c oggenc -s n -l names -x -d "Produce filenames as this string"
 complete -c oggenc -s X -l name-remove= -x -d "Remove the specified characters from parameters"
diff --git a/share/completions/opam.fish b/share/completions/opam.fish
index b01489c91..e15e27a59 100644
--- a/share/completions/opam.fish
+++ b/share/completions/opam.fish
@@ -91,7 +91,7 @@ complete -f -c opam -n '__fish_opam_needs_command' -a "remove uninstall" -d "Rem
 complete -f -c opam -n '__fish_opam_needs_command' -a "repository remote" -d "Manage OPAM repositories."
 complete -f -c opam -n '__fish_opam_needs_command' -a "search" -d "Search into the package list."
 complete -f -c opam -n '__fish_opam_needs_command' -a "show info" -d "Display information about specific packages."
-complete -f -c opam -n '__fish_opam_needs_command' -a "switch" -d "Manage multiple installation of compilers."
+complete -f -c opam -n '__fish_opam_needs_command' -a switch -d "Manage multiple installation of compilers."
 complete -f -c opam -n '__fish_opam_needs_command' -a "update" -d "Update the list of available packages."
 complete -f -c opam -n '__fish_opam_needs_command' -a "upgrade" -d "Upgrade the installed package to latest version."
 ## admin
diff --git a/share/completions/open.fish b/share/completions/open.fish
index 2b687763d..6e63ef381 100644
--- a/share/completions/open.fish
+++ b/share/completions/open.fish
@@ -1,14 +1,14 @@
 if test (uname) = 'Darwin' # OS X
-	complete -c open -s a -d 'Open APP, or open FILE(s), if supplied, with APP' -r -a "(mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*' | sed -E 's/.+\/(.+)\.app/\1/g')"
-	complete -c open -s b -d 'Bundle Identifier of APP to open, or to be used to open FILE' -x -a "(mdls (mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*') -name kMDItemCFBundleIdentifier | sed -E 's/kMDItemCFBundleIdentifier = \"(.+)\"/\1/g')"
-	complete -c open -s e -d 'Open FILE(s) with /Applications/TextEdit'
-	complete -c open -s t -d 'Open FILE(s) with default text editor from LaunchServices'
-	complete -c open -s f -d 'Open STDIN/PIPE with default text editor. End input with C-d.'
-	complete -c open -s F -d 'Don\'t restore previous application windows. Except Untitled documents.'
-	complete -c open -s W -d 'Wait until APP has exited'
-	complete -c open -s R -d 'Reveal FILE(s) in Finder'
-	complete -c open -s n -d 'Open new instace of APP'
-	complete -c open -s g -d 'Open in background'
-	complete -c open -s h -d 'Finds and opens for a header whose name matches the given string. Better performance with full names i.e. NSView.h' -r
-	complete -c open -l args -d 'Pass arguments to opened APP in the argv parameter to main()' -x
+    complete -c open -s a -d 'Open APP, or open FILE(s), if supplied, with APP' -r -a "(mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*' | sed -E 's/.+\/(.+)\.app/\1/g')"
+    complete -c open -s b -d 'Bundle Identifier of APP to open, or to be used to open FILE' -x -a "(mdls (mdfind -onlyin /Applications -onlyin ~/Applications -onlyin /Developer/Applications 'kMDItemContentType==com.apple.application-*') -name kMDItemCFBundleIdentifier | sed -E 's/kMDItemCFBundleIdentifier = \"(.+)\"/\1/g')"
+    complete -c open -s e -d 'Open FILE(s) with /Applications/TextEdit'
+    complete -c open -s t -d 'Open FILE(s) with default text editor from LaunchServices'
+    complete -c open -s f -d 'Open STDIN/PIPE with default text editor. End input with C-d.'
+    complete -c open -s F -d 'Don\'t restore previous application windows. Except Untitled documents.'
+    complete -c open -s W -d 'Wait until APP has exited'
+    complete -c open -s R -d 'Reveal FILE(s) in Finder'
+    complete -c open -s n -d 'Open new instace of APP'
+    complete -c open -s g -d 'Open in background'
+    complete -c open -s h -d 'Finds and opens for a header whose name matches the given string. Better performance with full names i.e. NSView.h' -r
+    complete -c open -l args -d 'Pass arguments to opened APP in the argv parameter to main()' -x
 end
diff --git a/share/completions/openocd.fish b/share/completions/openocd.fish
index a7fc002e0..a2cacf03f 100644
--- a/share/completions/openocd.fish
+++ b/share/completions/openocd.fish
@@ -7,13 +7,13 @@
 # Retrieve the likely compile-time PREFIX for openocd based off of where the binary
 # is located. e.g. if openocd is /usr/local/bin/openocd return /usr/local
 function __fish_openocd_prefix
-	string replace "/bin/openocd" "" (which openocd)
+    string replace "/bin/openocd" "" (which openocd)
 end
 
 # The results of this function are as if __fish_complete_suffix were called
 # while cd'd into the openocd scripts directory
 function __fish_complete_openocd_path
-	__fish_complete_suffix (commandline -ct) "$argv[1]" "$argv[2]" (__fish_openocd_prefix)/share/openocd/scripts
+    __fish_complete_suffix (commandline -ct) "$argv[1]" "$argv[2]" (__fish_openocd_prefix)/share/openocd/scripts
 end
 
 complete -c openocd -f # at no point does openocd take arbitrary arguments
diff --git a/share/completions/opkg.fish b/share/completions/opkg.fish
index 9e11bb92d..0dc30f5a8 100644
--- a/share/completions/opkg.fish
+++ b/share/completions/opkg.fish
@@ -2,7 +2,7 @@
 
 function __fish_opkg_no_subcommand -d 'Test if opkg has yet to be given the subcommand'
     for i in (commandline -opc)
-        if contains -- $i update upgrade install configure remove flag list list-installed list-upgradable list-changed-conffiles files search find info status download compare-versions print-architecture depends whatdepends whatdependsrec whatrecommends whatsuggests whatprovides whatconflicts  whatreplaces
+        if contains -- $i update upgrade install configure remove flag list list-installed list-upgradable list-changed-conffiles files search find info status download compare-versions print-architecture depends whatdepends whatdependsrec whatrecommends whatsuggests whatprovides whatconflicts whatreplaces
             return 1
         end
     end
diff --git a/share/completions/optipng.fish b/share/completions/optipng.fish
index 475b2410b..7e76c5ca3 100644
--- a/share/completions/optipng.fish
+++ b/share/completions/optipng.fish
@@ -22,14 +22,14 @@ complete -x -c optipng -n '__fish_should_complete_switches' -a '-snip\t"cut one
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-strip\t"strip specified metadata objects (e.g. "all")"'
 
 for n in (seq 0 9)
-	complete -x -c optipng -n '__fish_should_complete_switches' -a "-o$n\t\"PNG optimization level $n\""
+    complete -x -c optipng -n '__fish_should_complete_switches' -a "-o$n\t\"PNG optimization level $n\""
 end
 
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-i0\t"PNG interlace type 0"'
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-i1\t"PNG interlace type 1"'
 
 for n in (seq 0 5)
-	complete -x -c optipng -n '__fish_should_complete_switches' -a "-f$n\t'PNG delta filters $n'"
+    complete -x -c optipng -n '__fish_should_complete_switches' -a "-f$n\t'PNG delta filters $n'"
 end
 
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-out\t"write output file to <file>"'
@@ -37,5 +37,5 @@ complete -x -c optipng -n '__fish_should_complete_switches' -a '-dir\t"write out
 complete -x -c optipng -n '__fish_should_complete_switches' -a '-log\t"log messages to <file>"'
 
 complete -x -c optipng -n 'not __fish_prev_arg_in -out -dir -log' \
-					-a '(__fish_complete_suffix ".{png,PNG,pnm,PNM,tiff,TIFF,bmp,BMP}")'
+    -a '(__fish_complete_suffix ".{png,PNG,pnm,PNM,tiff,TIFF,bmp,BMP}")'
 complete -x -c optipng -n '__fish_prev_arg_in -dir' -a '(__fish_complete_suffix \'{}\')' # hack to list directories only
diff --git a/share/completions/pacaur.fish b/share/completions/pacaur.fish
index e7fcd19d7..1b5870d8a 100644
--- a/share/completions/pacaur.fish
+++ b/share/completions/pacaur.fish
@@ -39,14 +39,14 @@ complete -c $progname -s F -f -l files -n $noopt -d 'Query the files database'
 complete -c $progname -s V -f -l version -d 'Display version and exit'
 complete -c $progname -s h -f -l help -d 'Display help'
 # pacaur operations
-complete -c $progname -n $noopt -s s    -l search      -d "(AUR) Search for packages"
-complete -c $progname -n $noopt -s i    -l info        -d "(AUR) Show info for packages"
-complete -c $progname -n $noopt -s m    -l makepkg     -d "(AUR) Clone the packages' build files and build them"
-complete -c $progname -n $noopt -s y    -l sync        -d "(AUR) Clone build files, build and install packages"
-complete -c $progname -n $noopt -s k    -l check       -d "(AUR) Check foreign packages for updates"
-complete -c $progname -n $noopt -s u    -l update      -d "(AUR) Update foreign packages"
+complete -c $progname -n $noopt -s s -l search -d "(AUR) Search for packages"
+complete -c $progname -n $noopt -s i -l info -d "(AUR) Show info for packages"
+complete -c $progname -n $noopt -s m -l makepkg -d "(AUR) Clone the packages' build files and build them"
+complete -c $progname -n $noopt -s y -l sync -d "(AUR) Clone build files, build and install packages"
+complete -c $progname -n $noopt -s k -l check -d "(AUR) Check foreign packages for updates"
+complete -c $progname -n $noopt -s u -l update -d "(AUR) Update foreign packages"
 complete -c $progname -n "$noopt; and not __fish_contains_opt -s d download" -s d -l download -d "(AUR) Clone the packages' build files"
-complete -c $progname -n "$noopt; and __fish_contains_opt -s d download"     -s d -l download -d "Download dependencies recursively"
+complete -c $progname -n "$noopt; and __fish_contains_opt -s d download" -s d -l download -d "Download dependencies recursively"
 
 
 # General options
@@ -63,19 +63,19 @@ complete -c $progname -n $hasopt -l hookdir -d 'Hook file directory'
 complete -c $progname -n $hasopt -l logfile -d 'Specify alternative log file'
 complete -c $progname -n $hasopt -l noconfirm -d 'Bypass any question' -f
 # General options (pacaur only)
-complete -c $progname -n $hasopt -s a -l aur            -d 'Apply only for AUR targets'
-complete -c $progname -n $hasopt -s r -l repo           -d 'Apply only for specified repo'
-complete -c $progname -n $hasopt -s r -l edit           -d 'Edit build files'
-complete -c $progname -n $hasopt      -l noedit         -d 'Do not edit build files'
-complete -c $progname -n $hasopt      -l rebuild        -d 'Always rebuild packages'
-complete -c $progname -n $hasopt      -l silent         -d 'Redirect output to the log in the clone directory'
-complete -c $progname -n $hasopt      -l domain      -x -d 'Point at a domain other than the default aur.archlinux.org'
-complete -c $progname -n $hasopt      -l devel          -d 'Use devel packages'
-complete -c $progname -n $hasopt      -l ignore-ood     -d 'Ignore all results marked as out of date'
-complete -c $progname -n $hasopt      -l no-ignore-ood  -d 'Do not ignore all results marked as out of date'
-complete -c $progname -n $hasopt      -l sort           -d 'Sort ascending by key'  -xa "name votes popularity"
-complete -c $progname -n $hasopt      -l rsort          -d 'Sort descending by key' -xa "name votes popularity"
-complete -c $progname -n $hasopt      -l by             -d 'Search by field'  -xa "name name-desc maintainer"
+complete -c $progname -n $hasopt -s a -l aur -d 'Apply only for AUR targets'
+complete -c $progname -n $hasopt -s r -l repo -d 'Apply only for specified repo'
+complete -c $progname -n $hasopt -s r -l edit -d 'Edit build files'
+complete -c $progname -n $hasopt -l noedit -d 'Do not edit build files'
+complete -c $progname -n $hasopt -l rebuild -d 'Always rebuild packages'
+complete -c $progname -n $hasopt -l silent -d 'Redirect output to the log in the clone directory'
+complete -c $progname -n $hasopt -l domain -x -d 'Point at a domain other than the default aur.archlinux.org'
+complete -c $progname -n $hasopt -l devel -d 'Use devel packages'
+complete -c $progname -n $hasopt -l ignore-ood -d 'Ignore all results marked as out of date'
+complete -c $progname -n $hasopt -l no-ignore-ood -d 'Do not ignore all results marked as out of date'
+complete -c $progname -n $hasopt -l sort -d 'Sort ascending by key' -xa "name votes popularity"
+complete -c $progname -n $hasopt -l rsort -d 'Sort descending by key' -xa "name votes popularity"
+complete -c $progname -n $hasopt -l by -d 'Search by field' -xa "name name-desc maintainer"
 
 # Transaction options (sync, remove, upgrade)
 for condition in sync remove upgrade
diff --git a/share/completions/pacman-key.fish b/share/completions/pacman-key.fish
index 2f2fbc4fa..53bdc6408 100644
--- a/share/completions/pacman-key.fish
+++ b/share/completions/pacman-key.fish
@@ -1,22 +1,22 @@
 
-complete -c pacman-key -s a -l 'add'            -d 'Add or update keys from <file>'
-complete -c pacman-key      -l 'config'         -d 'Use an alternate config <file>'
-complete -c pacman-key -s d -l 'delete'         -d 'Remove the <keys> from the keyring'
-complete -c pacman-key -s e -l 'export'         -d 'Export <keys> to stdout'
-complete -c pacman-key      -l 'edit-key'       -d 'Present a menu on specified <keys>'
-complete -c pacman-key -s f -l 'finger'         -d 'List a fingerprint for each specified <key>'
-complete -c pacman-key      -l 'gpgdir'         -d 'Alternate home <dir> for GnuPG'
-complete -c pacman-key -s h -l 'help'           -d 'Output syntax and command line options'
-complete -c pacman-key      -l 'import'         -d 'Imports keys from <dir>/pubring.gpg'
-complete -c pacman-key      -l 'import-trustdb' -d 'Imports ownertrust values from <dir>/trustdb.gpg'
-complete -c pacman-key      -l 'init'           -d 'Initialize the keyring'
-complete -c pacman-key      -l 'keyserver'      -d 'Use the specified <keyserver>'
-complete -c pacman-key -s l -l 'list-keys'      -d 'Lists all or specified <keys> from the keyring'
-complete -c pacman-key      -l 'list-sigs'      -d 'Same as --list-keys, but with signatures'
-complete -c pacman-key      -l 'lsign-key'      -d 'Locally sign the given <key>'
-complete -c pacman-key -s r -l 'recv-keys'      -d 'Equivalent to --recv-keys in GnuPG'
-complete -c pacman-key      -l 'refresh-keys'   -d 'Equivalent to --refresh-keys in GnuPG'
-complete -c pacman-key      -l 'populate'       -d 'Reload the default keys'
-complete -c pacman-key -s u -l 'updatedb'       -d 'Equivalent to --check-trustdb in GnuPG'
-complete -c pacman-key -s v -l 'verify'         -d 'Verify the given <signature> file'
-complete -c pacman-key -s V -l 'version'        -d 'Displays the program version'
+complete -c pacman-key -s a -l 'add' -d 'Add or update keys from <file>'
+complete -c pacman-key -l 'config' -d 'Use an alternate config <file>'
+complete -c pacman-key -s d -l 'delete' -d 'Remove the <keys> from the keyring'
+complete -c pacman-key -s e -l 'export' -d 'Export <keys> to stdout'
+complete -c pacman-key -l 'edit-key' -d 'Present a menu on specified <keys>'
+complete -c pacman-key -s f -l 'finger' -d 'List a fingerprint for each specified <key>'
+complete -c pacman-key -l 'gpgdir' -d 'Alternate home <dir> for GnuPG'
+complete -c pacman-key -s h -l 'help' -d 'Output syntax and command line options'
+complete -c pacman-key -l 'import' -d 'Imports keys from <dir>/pubring.gpg'
+complete -c pacman-key -l 'import-trustdb' -d 'Imports ownertrust values from <dir>/trustdb.gpg'
+complete -c pacman-key -l 'init' -d 'Initialize the keyring'
+complete -c pacman-key -l 'keyserver' -d 'Use the specified <keyserver>'
+complete -c pacman-key -s l -l 'list-keys' -d 'Lists all or specified <keys> from the keyring'
+complete -c pacman-key -l 'list-sigs' -d 'Same as --list-keys, but with signatures'
+complete -c pacman-key -l 'lsign-key' -d 'Locally sign the given <key>'
+complete -c pacman-key -s r -l 'recv-keys' -d 'Equivalent to --recv-keys in GnuPG'
+complete -c pacman-key -l 'refresh-keys' -d 'Equivalent to --refresh-keys in GnuPG'
+complete -c pacman-key -l 'populate' -d 'Reload the default keys'
+complete -c pacman-key -s u -l 'updatedb' -d 'Equivalent to --check-trustdb in GnuPG'
+complete -c pacman-key -s v -l 'verify' -d 'Verify the given <signature> file'
+complete -c pacman-key -s V -l 'version' -d 'Displays the program version'
diff --git a/share/completions/pacmd.fish b/share/completions/pacmd.fish
index f5da595f3..c3ad1ef25 100644
--- a/share/completions/pacmd.fish
+++ b/share/completions/pacmd.fish
@@ -14,7 +14,7 @@ complete -f -c pacmd -n "__fish_seen_subcommand_from describe-module" -a '(__fis
 complete -f -c pacmd -n "__fish_seen_subcommand_from kill-client" -a '(__fish_pa_complete_type clients | string match -r "^[0-9].*")' # match because this only takes an index
 
 for t in client sink-input source-output
-	complete -f -c pacmd -n "__fish_seen_subcommand_from kill-$t" -a '(__fish_pa_complete_type '$t's | string match -r "^[0-9].*")' # match because this only takes an index
+    complete -f -c pacmd -n "__fish_seen_subcommand_from kill-$t" -a '(__fish_pa_complete_type '$t's | string match -r "^[0-9].*")' # match because this only takes an index
 end
 
 complete -f -c pactl -n "__fish_seen_subcommand_from suspend" -a '0 false off' -d "Resume"
diff --git a/share/completions/pactl.fish b/share/completions/pactl.fish
index 499c162e0..dce2a3b9f 100644
--- a/share/completions/pactl.fish
+++ b/share/completions/pactl.fish
@@ -10,41 +10,41 @@
 set -l commands (pacmd help | string match -r '^ +[-\w]+' | string trim)
 # These are the actual commands for pactl - we complete only these, and then the cmd commands in that completion
 set -l ctlcommands stat info list exit {upload,play,remove}-sample {load,unload}-module \
-move-{sink-input,source-output} suspend-{sink,source} set-{card-profile,default-sink,sink-port,source-port,port-latency-offset} \
-set-{sink,source,sink-input,source-output}-{volume,mute} set-sink-formats subscribe
+    move-{sink-input,source-output} suspend-{sink,source} set-{card-profile,default-sink,sink-port,source-port,port-latency-offset} \
+    set-{sink,source,sink-input,source-output}-{volume,mute} set-sink-formats subscribe
 
 function __fish_pa_complete_type
-	pactl list short $argv
-	# The default is to show the number, then the name and then some info - also show the name, then the number as it's a bit friendlier
-	pactl list short $argv | string replace -r  '(\w+)\t([-\w]+)' '$2\t$1'
+    pactl list short $argv
+    # The default is to show the number, then the name and then some info - also show the name, then the number as it's a bit friendlier
+    pactl list short $argv | string replace -r '(\w+)\t([-\w]+)' '$2\t$1'
 end
 
 function __fish_pa_print_type
-	pactl list short $argv
-	# Pa allows both a numerical index and a name
-	pactl list short $argv | string replace -r  '(\w+)\t.*' '$1'
+    pactl list short $argv
+    # Pa allows both a numerical index and a name
+    pactl list short $argv | string replace -r '(\w+)\t.*' '$1'
 end
 
 function __fish_pa_list_ports
-	# Yes, this is localized
-	env LC_ALL=C pactl list cards 2>/dev/null | sed -n -e '/Ports:/,$p' | string match -r '^\t\t\w.*$' | string replace -r '\s+([-+\w:]+): (\w.+)' '$1\t$2'
+    # Yes, this is localized
+    env LC_ALL=C pactl list cards 2>/dev/null | sed -n -e '/Ports:/,$p' | string match -r '^\t\t\w.*$' | string replace -r '\s+([-+\w:]+): (\w.+)' '$1\t$2'
 end
 
 function __fish_pa_list_profiles
-	env LC_ALL=C pactl list cards 2>/dev/null | sed -n -e '/Profiles:/,/Active Profile/p' | string match -r '\t\t.*' | string replace -r '\s+([-+\w:]+): (\w.+)' '$1\t$2'
+    env LC_ALL=C pactl list cards 2>/dev/null | sed -n -e '/Profiles:/,/Active Profile/p' | string match -r '\t\t.*' | string replace -r '\s+([-+\w:]+): (\w.+)' '$1\t$2'
 end
 
 # This is needed to filter out loaded modules
 function __fish_pa_complete_unloaded_modules
-	# We need to get just the module names
-	set -l loaded (__fish_pa_print_type modules | string replace -r '^\w*\t([-\w]+).*' '$1')
-	pulseaudio --dump-modules | while read name description
-		# This is a potential source of slowness, but on my system it's instantaneous
-		# with 73 modules
-		if not contains -- $name $loaded
-			printf "%s\t%s\n" $name $description
-		end
-	end
+    # We need to get just the module names
+    set -l loaded (__fish_pa_print_type modules | string replace -r '^\w*\t([-\w]+).*' '$1')
+    pulseaudio --dump-modules | while read name description
+        # This is a potential source of slowness, but on my system it's instantaneous
+        # with 73 modules
+        if not contains -- $name $loaded
+            printf "%s\t%s\n" $name $description
+        end
+    end
 end
 
 complete -f -e -c pactl
@@ -66,48 +66,48 @@ complete -f -c pactl -n "__fish_seen_subcommand_from unload-module" -a '(__fish_
 complete -f -c pactl -n "__fish_seen_subcommand_from load-module" -a '(__fish_pa_complete_unloaded_modules)'
 
 complete -f -c pactl -n "__fish_seen_subcommand_from move-sink-input; and not __fish_seen_subcommand_from (__fish_pa_print_type sink-inputs)" \
--a '(__fish_pa_complete_type sink-inputs)'
+    -a '(__fish_pa_complete_type sink-inputs)'
 complete -f -c pactl -n "__fish_seen_subcommand_from move-sink-input; and __fish_seen_subcommand_from (__fish_pa_print_type sink-inputs)" \
--a '(__fish_pa_complete_type sinks)'
+    -a '(__fish_pa_complete_type sinks)'
 complete -f -c pactl -n "__fish_seen_subcommand_from move-source-output; and not __fish_seen_subcommand_from (__fish_pa_print_type source-outputs)" \
--a '(__fish_pa_complete_type source-outputs)'
+    -a '(__fish_pa_complete_type source-outputs)'
 complete -f -c pactl -n "__fish_seen_subcommand_from move-source-output; and __fish_seen_subcommand_from (__fish_pa_print_type source-outputs)" \
--a '(__fish_pa_complete_type sources)'
+    -a '(__fish_pa_complete_type sources)'
 
 # Suspend
 for t in source sink
-	complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_complete_type "$t"s)"
-	complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a '0 false off' -d "Resume"
-	complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a '1 true on' -d "Suspend"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_complete_type "$t"s)"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_list_ports)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_complete_type "$t"s)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a '0 false off' -d "Resume"
+    complete -f -c pactl -n "__fish_seen_subcommand_from suspend-$t; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a '1 true on' -d "Suspend"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_complete_type "$t"s)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-port; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_list_ports)"
 end
 
 # Volume and mute
 for t in source sink source-output sink-input
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-volume; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_complete_type "$t"s)"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-volume; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(seq 0 100)%"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "(__fish_pa_complete_type "$t"s)"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "1 true on" -d "Muted"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "0 false off" -d "Unmuted"
-	complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
-	-a "toggle"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-volume; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_complete_type "$t"s)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-volume; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(seq 0 100)%"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and not __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "(__fish_pa_complete_type "$t"s)"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "1 true on" -d "Muted"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "0 false off" -d "Unmuted"
+    complete -f -c pactl -n "__fish_seen_subcommand_from set-$t-mute; and __fish_seen_subcommand_from (__fish_pa_print_type "$t"s)" \
+        -a "toggle"
 end
 
 complete -f -c pactl -n "__fish_seen_subcommand_from set-card-profile; and not __fish_seen_subcommand_from (__fish_pa_print_type cards)" \
--a "(__fish_pa_complete_type cards)"
+    -a "(__fish_pa_complete_type cards)"
 complete -f -c pactl -n "__fish_seen_subcommand_from set-card-profile; and __fish_seen_subcommand_from (__fish_pa_print_type cards)" \
--a "(__fish_pa_list_profiles)"
+    -a "(__fish_pa_list_profiles)"
 
 complete -f -c pactl -n "__fish_seen_subcommand_from set-default-sink" -a "(__fish_pa_complete_type sinks)"
 
diff --git a/share/completions/pactree.fish b/share/completions/pactree.fish
index 81c37d725..a20607002 100644
--- a/share/completions/pactree.fish
+++ b/share/completions/pactree.fish
@@ -1,11 +1,11 @@
 complete -c pactree -xa "(pacman -Sl | cut --delim ' ' --fields 2- | tr ' ' \t | sort)"
-complete -c pactree -s b -l dbpath       -d 'Set an alternate database location' -xa '(__fish_complete_directories)'
-complete -c pactree -s c -l color        -d 'Colorize output'
-complete -c pactree -s d -l depth        -d 'Limit the depth of recursion' -x
-complete -c pactree -s g -l graph        -d 'Generate output for graphviz\'s dot'
-complete -c pactree -s h -l help         -d 'Display this help message'
-complete -c pactree -s l -l linear       -d 'Enable linear output'
-complete -c pactree -s r -l reverse      -d 'Show reverse dependencies'
-complete -c pactree -s s -l sync         -d 'Search sync DBs instead of local'
-complete -c pactree -s u -l unique       -d 'Show dependencies with no duplicates (implies -l)'
-complete -c pactree -l config            -d 'Set an alternate configuration file' -r
+complete -c pactree -s b -l dbpath -d 'Set an alternate database location' -xa '(__fish_complete_directories)'
+complete -c pactree -s c -l color -d 'Colorize output'
+complete -c pactree -s d -l depth -d 'Limit the depth of recursion' -x
+complete -c pactree -s g -l graph -d 'Generate output for graphviz\'s dot'
+complete -c pactree -s h -l help -d 'Display this help message'
+complete -c pactree -s l -l linear -d 'Enable linear output'
+complete -c pactree -s r -l reverse -d 'Show reverse dependencies'
+complete -c pactree -s s -l sync -d 'Search sync DBs instead of local'
+complete -c pactree -s u -l unique -d 'Show dependencies with no duplicates (implies -l)'
+complete -c pactree -l config -d 'Set an alternate configuration file' -r
diff --git a/share/completions/pandoc.fish b/share/completions/pandoc.fish
index cb2927276..76f473402 100644
--- a/share/completions/pandoc.fish
+++ b/share/completions/pandoc.fish
@@ -53,14 +53,14 @@ complete -c pandoc -x -l asciimathml -l mimetex -l jsmath -l gladtex
 complete -c pandoc -x -s c -l css
 
 # options that use informats and outformats
-complete -c pandoc -x -s f -s r -l from -l read      -a "$informats"
-complete -c pandoc -x -s t -s w -l to -l write       -a "$outformats"
+complete -c pandoc -x -s f -s r -l from -l read -a "$informats"
+complete -c pandoc -x -s t -s w -l to -l write -a "$outformats"
 complete -c pandoc -x -s D -l print-default-template -a "$outformats"
 
 # TODO: add support for enabling and disabling extensions using the +/- switches
 
 # options that take directories
-complete -c pandoc -x -l data-dir      -a "(__fish_complete_directories (commandline -ct) "")"
+complete -c pandoc -x -l data-dir -a "(__fish_complete_directories (commandline -ct) "")"
 complete -c pandoc -x -l extract-media -a "(__fish_complete_directories (commandline -ct) "")"
 
 # options that take files
@@ -80,27 +80,27 @@ complete -c pandoc -r -l citation-abbreviations
 
 # options that take files filtered by extension
 
-complete -c pandoc -r -f -l print-highlight-style  -a "(__fish_complete_suffix 'theme' )"
-complete -c pandoc -r -f -l highlight_style        -a "(__fish_complete_suffix 'theme' )"
-complete -c pandoc -r -f -l csl                    -a "(__fish_complete_suffix 'csl'   )"
+complete -c pandoc -r -f -l print-highlight-style -a "(__fish_complete_suffix 'theme' )"
+complete -c pandoc -r -f -l highlight_style -a "(__fish_complete_suffix 'theme' )"
+complete -c pandoc -r -f -l csl -a "(__fish_complete_suffix 'csl'   )"
 complete -c pandoc -r -f -l reference-file -a "(__fish_complete_suffix 'odt') (__fish_complete_suffix 'docx')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'bib')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'bibtex')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'copac')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'json')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'yaml')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'enl')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'xml')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'wos')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'medline')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'mods')"
-complete -c pandoc -r -f -l bibliography   -a "(__fish_complete_suffix 'ria')"
-complete -c pandoc -r -f -l lua-filter     -a "(__fish_complete_suffix 'lua')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'bib')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'bibtex')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'copac')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'json')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'yaml')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'enl')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'xml')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'wos')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'medline')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'mods')"
+complete -c pandoc -r -f -l bibliography -a "(__fish_complete_suffix 'ria')"
+complete -c pandoc -r -f -l lua-filter -a "(__fish_complete_suffix 'lua')"
 
 # options that take files in DATADIR
-complete -c pandoc -r -s F -l filter       -a "(find $datadir/filters/** | string replace -- '$datadir/filters/' '')"
-complete -c pandoc -r -l template          -a "(find $datadir/templates/** | string replace -- '$datadir/templates/' '')"
-complete -c pandoc -r -f -l lua-filter     -a "(find $datadir/** | string match -r '.lua\$' | string replace -- '$datadir/' '')"
+complete -c pandoc -r -s F -l filter -a "(find $datadir/filters/** | string replace -- '$datadir/filters/' '')"
+complete -c pandoc -r -l template -a "(find $datadir/templates/** | string replace -- '$datadir/templates/' '')"
+complete -c pandoc -r -f -l lua-filter -a "(find $datadir/** | string match -r '.lua\$' | string replace -- '$datadir/' '')"
 
 # options that require arguments which cannot be autocompleted
 complete -c pandoc -x -l indented-code-classes
diff --git a/share/completions/passwd.fish b/share/completions/passwd.fish
index 3d1052f07..915bc340d 100644
--- a/share/completions/passwd.fish
+++ b/share/completions/passwd.fish
@@ -1,43 +1,43 @@
 # Completions for passwd
 
 function __fish_passwd_darwin_infosystem
-	echo -e "PAM\tPluggable Authentication Module"
-	echo -e "opendirectory\tOpen Directory-compatible system"
-	echo -e "file\tLocal flat-file"
-	echo -e "nis\tRemote NIS server"
+    echo -e "PAM\tPluggable Authentication Module"
+    echo -e "opendirectory\tOpen Directory-compatible system"
+    echo -e "file\tLocal flat-file"
+    echo -e "nis\tRemote NIS server"
 end
 
 if passwd --help >/dev/null 2>&1
-	complete -c passwd -n '__fish_contains_opt -s S status' -s a -l all -f -d "Display password state for all users"
-	complete -c passwd -s d -l delete -f -d "Delete user password"
-	complete -c passwd -s e -l expire -f -d "Immediately obsolete user password"
-	complete -c passwd -s h -l help -f -d "Display help and exit"
-	complete -c passwd -s i -l inactive -x -d "Schedule account inactivation after password expiration"
-	complete -c passwd -s k -l keep-tokens -f -d "Wait tokens expiration before changing password"
-	complete -c passwd -s l -l lock -f -d "Lock password"
-	complete -c passwd -s n -l mindays -x -d "Define minimum delay between password changes"
-	complete -c passwd -s q -l quiet -f -d "Be quiet"
-	complete -c passwd -s r -l repository -r -d "Update given repository"
-	complete -c passwd -s R -l root -r -d "Use given directory as working directory"
-	complete -c passwd -s S -l status -f -d "Display account status"
-	complete -c passwd -s u -l unlock -f -d "Unlock password"
-	complete -c passwd -s w -l warndays -x -d "Define warning period before mandatory password change"
-	complete -c passwd -s w -l warndays -x -d "Define maximum period of password validity"
-	complete -c passwd -n '__fish_not_contain_opt -s A all' -f -a '(__fish_complete_users)' -d "Account to be altered"
+    complete -c passwd -n '__fish_contains_opt -s S status' -s a -l all -f -d "Display password state for all users"
+    complete -c passwd -s d -l delete -f -d "Delete user password"
+    complete -c passwd -s e -l expire -f -d "Immediately obsolete user password"
+    complete -c passwd -s h -l help -f -d "Display help and exit"
+    complete -c passwd -s i -l inactive -x -d "Schedule account inactivation after password expiration"
+    complete -c passwd -s k -l keep-tokens -f -d "Wait tokens expiration before changing password"
+    complete -c passwd -s l -l lock -f -d "Lock password"
+    complete -c passwd -s n -l mindays -x -d "Define minimum delay between password changes"
+    complete -c passwd -s q -l quiet -f -d "Be quiet"
+    complete -c passwd -s r -l repository -r -d "Update given repository"
+    complete -c passwd -s R -l root -r -d "Use given directory as working directory"
+    complete -c passwd -s S -l status -f -d "Display account status"
+    complete -c passwd -s u -l unlock -f -d "Unlock password"
+    complete -c passwd -s w -l warndays -x -d "Define warning period before mandatory password change"
+    complete -c passwd -s w -l warndays -x -d "Define maximum period of password validity"
+    complete -c passwd -n '__fish_not_contain_opt -s A all' -f -a '(__fish_complete_users)' -d "Account to be altered"
 else # Not Linux, so let's see what it is, with the ugly uname
-	set os_type (uname)
-	switch $os_type
-		case Darwin # macOS family
-			complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
-			complete -c passwd -x -s i -a '(__fish_passwd_darwin_infosystem)' -d "Directory system to apply the update to"
-			complete -c passwd -x -s l -d "Location to be updated on chosen directory system"
-			complete -c passwd -x -s u -d "User name to use on chosen directory system"
-		case FreeBSD
-			complete -c passwd -f -s l -d "Update locally, not in Kerberos"
-			complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
-	end
-	# This is common to Darwin, FreeBSD and OpenBSD, and is even the only possible completion under OpenBSD
-	# This is separated from Linux completions, because the Linux one is useless with -A / --all,
-	# whereas -A / --all does not exist under *BSD
-	complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
+    set os_type (uname)
+    switch $os_type
+        case Darwin # macOS family
+            complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
+            complete -c passwd -x -s i -a '(__fish_passwd_darwin_infosystem)' -d "Directory system to apply the update to"
+            complete -c passwd -x -s l -d "Location to be updated on chosen directory system"
+            complete -c passwd -x -s u -d "User name to use on chosen directory system"
+        case FreeBSD
+            complete -c passwd -f -s l -d "Update locally, not in Kerberos"
+            complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
+    end
+    # This is common to Darwin, FreeBSD and OpenBSD, and is even the only possible completion under OpenBSD
+    # This is separated from Linux completions, because the Linux one is useless with -A / --all,
+    # whereas -A / --all does not exist under *BSD
+    complete -c passwd -f -a '(__fish_complete_users)' -d "Account to be altered"
 end
diff --git a/share/completions/pfctl.fish b/share/completions/pfctl.fish
index 2c318d2a4..d28e8bdbe 100644
--- a/share/completions/pfctl.fish
+++ b/share/completions/pfctl.fish
@@ -1,5 +1,5 @@
 complete -c pfctl -s s --description 'Show a filter parameter by modifier' -xa \
-	'queue\t"Show loaded queue definitions" \
+    'queue\t"Show loaded queue definitions" \
 	rules\t"Show loaded filter rules" \
 	Anchors\t"Show anchors attached to main ruleset" \
 	states\t"Show state table"
@@ -13,7 +13,7 @@ complete -c pfctl -s s --description 'Show a filter parameter by modifier' -xa \
 	Interfaces\t"List PF interfaces/drivers" \
 	all\t"Everything."'
 complete -c pfctl -s F --description 'Flush filter params specified by mod' -xa \
-	'rules\t"Flush filter rules" \
+    'rules\t"Flush filter rules" \
 	states\t"Flush state table" \
 	Sources\t"Flush source tracking table" \
 	info\t"Flush filter information" \
@@ -21,7 +21,7 @@ complete -c pfctl -s F --description 'Flush filter params specified by mod' -xa
 	ospf\t"Flush the passive OS fingerprints" \
 	all\t"Flush everything"'
 complete -c pfctl -s T --description 'Table command' -xa \
-	'kill\t"Kill a table." \
+    'kill\t"Kill a table." \
 	flush\t"Flush addresses of a table" \
 	add\t"Add one or more addresses in table" \
 	delete\t"Delete one or more addresses from a table" \
diff --git a/share/completions/pgrep.fish b/share/completions/pgrep.fish
index 76a9cb234..0ff8793b0 100644
--- a/share/completions/pgrep.fish
+++ b/share/completions/pgrep.fish
@@ -1,4 +1,4 @@
 
 __fish_complete_pgrep pgrep
 complete -c pgrep -s d -r -d 'Output delimiter'
-complete -c pgrep -s l    -d 'List the process name as well as the process ID'
+complete -c pgrep -s l -d 'List the process name as well as the process ID'
diff --git a/share/completions/pinky.fish b/share/completions/pinky.fish
index 7f2078e5f..c35eaf223 100644
--- a/share/completions/pinky.fish
+++ b/share/completions/pinky.fish
@@ -1,12 +1,12 @@
 complete -c pinky -a "(__fish_complete_users)" -f
-complete -c pinky -s l              -d "produce long format output for the specified USERs"
-complete -c pinky -s b              -d "omit the user's home directory and shell in long format"
-complete -c pinky -s h              -d "omit the user's project file in long format"
-complete -c pinky -s p              -d "omit the user's plan file in long format"
-complete -c pinky -s s              -d "do short format output, this is the default"
-complete -c pinky -s f              -d "omit the line of column headings in short format"
-complete -c pinky -s w              -d "omit the user's full name in short format"
-complete -c pinky -s i              -d "omit the user's full name and remote host in short format"
-complete -c pinky -s q              -d "omit the user's full name, remote host and idle time in short format"
-complete -c pinky -l help     -d "display this help and exit"
-complete -c pinky -l version  -d "output version information and exit"
+complete -c pinky -s l -d "produce long format output for the specified USERs"
+complete -c pinky -s b -d "omit the user's home directory and shell in long format"
+complete -c pinky -s h -d "omit the user's project file in long format"
+complete -c pinky -s p -d "omit the user's plan file in long format"
+complete -c pinky -s s -d "do short format output, this is the default"
+complete -c pinky -s f -d "omit the line of column headings in short format"
+complete -c pinky -s w -d "omit the user's full name in short format"
+complete -c pinky -s i -d "omit the user's full name and remote host in short format"
+complete -c pinky -s q -d "omit the user's full name, remote host and idle time in short format"
+complete -c pinky -l help -d "display this help and exit"
+complete -c pinky -l version -d "output version information and exit"
diff --git a/share/completions/pkg.fish b/share/completions/pkg.fish
index 8a4b96737..e2e03d0a5 100644
--- a/share/completions/pkg.fish
+++ b/share/completions/pkg.fish
@@ -1,87 +1,87 @@
 # Completions for pkgng package manager
 
 if uname | not string match -q FreeBSD
-	exit
+    exit
 end
 
 function __fish_pkg_is
-	for option in $argv
-		if contains $option (commandline -poc)
-			return 0
-		end
-	end
-	return 1
+    for option in $argv
+        if contains $option (commandline -poc)
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_pkg_subcommand
-	set -l skip_next 1
-	for token in (commandline -opc)
-		if test $skip_next = 1
-			set skip_next 0
-			continue
-		end
-		switch $token
-			# Option parser allows shortened long options
-			case '--*=*'
-				continue
-			case -{o,j,c,r,C,R} --op\* --j\* --ch\* --ro\* --co\* --re\*
-				set skip_next 1
-				continue
-			case '-*'
-				continue
-		end
-		return 1
-	end
-	return 0
+    set -l skip_next 1
+    for token in (commandline -opc)
+        if test $skip_next = 1
+            set skip_next 0
+            continue
+        end
+        switch $token
+            # Option parser allows shortened long options
+            case '--*=*'
+                continue
+            case -{o,j,c,r,C,R} --op\* --j\* --ch\* --ro\* --co\* --re\*
+                set skip_next 1
+                continue
+            case '-*'
+                continue
+        end
+        return 1
+    end
+    return 0
 end
 
-complete -c pkg -n __fish_pkg_subcommand    -s v -l version       -d "Display version and exit"
-complete -c pkg -n __fish_pkg_subcommand    -s d -l debug         -d "Show debug information"
-complete -c pkg -n __fish_pkg_subcommand    -s l -l list          -d "List subcommands"
-complete -c pkg -n __fish_pkg_subcommand -x -s o -l option        -d "Set configuration option"
-complete -c pkg -n __fish_pkg_subcommand    -s N                  -d "Run sanity test"
-complete -c pkg -n __fish_pkg_subcommand -x -s j -l jail          -d "Run package manager within jail"
-complete -c pkg -n __fish_pkg_subcommand -r -s c -l chroot        -d "Run package manager within chroot"
-complete -c pkg -n __fish_pkg_subcommand -r -s r -l rootdir       -d "Install packages in specified root"
-complete -c pkg -n __fish_pkg_subcommand -r -s C -l config        -d "Use configuration file"
+complete -c pkg -n __fish_pkg_subcommand -s v -l version -d "Display version and exit"
+complete -c pkg -n __fish_pkg_subcommand -s d -l debug -d "Show debug information"
+complete -c pkg -n __fish_pkg_subcommand -s l -l list -d "List subcommands"
+complete -c pkg -n __fish_pkg_subcommand -x -s o -l option -d "Set configuration option"
+complete -c pkg -n __fish_pkg_subcommand -s N -d "Run sanity test"
+complete -c pkg -n __fish_pkg_subcommand -x -s j -l jail -d "Run package manager within jail"
+complete -c pkg -n __fish_pkg_subcommand -r -s c -l chroot -d "Run package manager within chroot"
+complete -c pkg -n __fish_pkg_subcommand -r -s r -l rootdir -d "Install packages in specified root"
+complete -c pkg -n __fish_pkg_subcommand -r -s C -l config -d "Use configuration file"
 complete -c pkg -n __fish_pkg_subcommand -r -s R -l repo-conf-dir -d "Set repository configuration directory"
-complete -c pkg -n __fish_pkg_subcommand    -s 4                  -d "Use IPv4"
-complete -c pkg -n __fish_pkg_subcommand    -s 6                  -d "Use IPv6"
+complete -c pkg -n __fish_pkg_subcommand -s 4 -d "Use IPv4"
+complete -c pkg -n __fish_pkg_subcommand -s 6 -d "Use IPv6"
 
-complete -c pkg -n __fish_pkg_subcommand -xa add        -d "Install package file"
-complete -c pkg -n __fish_pkg_subcommand -xa annotate   -d "Modify annotations on packages"
-complete -c pkg -n __fish_pkg_subcommand -xa audit      -d "Audit installed packages"
+complete -c pkg -n __fish_pkg_subcommand -xa add -d "Install package file"
+complete -c pkg -n __fish_pkg_subcommand -xa annotate -d "Modify annotations on packages"
+complete -c pkg -n __fish_pkg_subcommand -xa audit -d "Audit installed packages"
 complete -c pkg -n __fish_pkg_subcommand -xa autoremove -d "Delete unneeded packages"
-complete -c pkg -n __fish_pkg_subcommand -xa backup     -d "Dump package database"
-complete -c pkg -n __fish_pkg_subcommand -xa check      -d "Check installed packages"
-complete -c pkg -n __fish_pkg_subcommand -xa clean      -d "Clean local cache"
-complete -c pkg -n __fish_pkg_subcommand -xa convert    -d "Convert package from pkg_add format"
-complete -c pkg -n __fish_pkg_subcommand -xa create     -d "Create a package"
-complete -c pkg -n __fish_pkg_subcommand -xa delete     -d "Remove a package"
-complete -c pkg -n __fish_pkg_subcommand -xa fetch      -d "Download a remote package"
-complete -c pkg -n __fish_pkg_subcommand -xa help       -d "Display help for command"
-complete -c pkg -n __fish_pkg_subcommand -xa info       -d "List installed packages"
-complete -c pkg -n __fish_pkg_subcommand -xa install    -d "Install packages"
-complete -c pkg -n __fish_pkg_subcommand -xa list       -d "List files belonging to package(s)"
-complete -c pkg -n __fish_pkg_subcommand -xa lock       -d "Prevent package modification"
-complete -c pkg -n __fish_pkg_subcommand -xa plugins    -d "List package manager plugins"
-complete -c pkg -n __fish_pkg_subcommand -xa query      -d "Query installed packages"
-complete -c pkg -n __fish_pkg_subcommand -xa register   -d "Register a package in a database"
-complete -c pkg -n __fish_pkg_subcommand -xa remove     -d "Remove a package"
-complete -c pkg -n __fish_pkg_subcommand -xa repo       -d "Create package repository"
-complete -c pkg -n __fish_pkg_subcommand -xa rquery     -d "Query information for remote repositories"
-complete -c pkg -n __fish_pkg_subcommand -xa search     -d "Find packages"
-complete -c pkg -n __fish_pkg_subcommand -xa set        -d "Modify package information in database"
-complete -c pkg -n __fish_pkg_subcommand -xa shell      -d "Open a SQLite shell"
-complete -c pkg -n __fish_pkg_subcommand -xa shlib      -d "Display packages linking to shared library"
-complete -c pkg -n __fish_pkg_subcommand -xa show       -d "Show information about package(s)"
-complete -c pkg -n __fish_pkg_subcommand -xa stats      -d "Display package statistics"
-complete -c pkg -n __fish_pkg_subcommand -xa unlock     -d "Stop preventing package modification"
-complete -c pkg -n __fish_pkg_subcommand -xa update     -d "Update remote repositories"
-complete -c pkg -n __fish_pkg_subcommand -xa updating   -d "Display UPDATING entries"
-complete -c pkg -n __fish_pkg_subcommand -xa upgrade    -d "Upgrade packages"
-complete -c pkg -n __fish_pkg_subcommand -xa version    -d "Show package versions"
-complete -c pkg -n __fish_pkg_subcommand -xa which      -d "Check which package provides a file"
+complete -c pkg -n __fish_pkg_subcommand -xa backup -d "Dump package database"
+complete -c pkg -n __fish_pkg_subcommand -xa check -d "Check installed packages"
+complete -c pkg -n __fish_pkg_subcommand -xa clean -d "Clean local cache"
+complete -c pkg -n __fish_pkg_subcommand -xa convert -d "Convert package from pkg_add format"
+complete -c pkg -n __fish_pkg_subcommand -xa create -d "Create a package"
+complete -c pkg -n __fish_pkg_subcommand -xa delete -d "Remove a package"
+complete -c pkg -n __fish_pkg_subcommand -xa fetch -d "Download a remote package"
+complete -c pkg -n __fish_pkg_subcommand -xa help -d "Display help for command"
+complete -c pkg -n __fish_pkg_subcommand -xa info -d "List installed packages"
+complete -c pkg -n __fish_pkg_subcommand -xa install -d "Install packages"
+complete -c pkg -n __fish_pkg_subcommand -xa list -d "List files belonging to package(s)"
+complete -c pkg -n __fish_pkg_subcommand -xa lock -d "Prevent package modification"
+complete -c pkg -n __fish_pkg_subcommand -xa plugins -d "List package manager plugins"
+complete -c pkg -n __fish_pkg_subcommand -xa query -d "Query installed packages"
+complete -c pkg -n __fish_pkg_subcommand -xa register -d "Register a package in a database"
+complete -c pkg -n __fish_pkg_subcommand -xa remove -d "Remove a package"
+complete -c pkg -n __fish_pkg_subcommand -xa repo -d "Create package repository"
+complete -c pkg -n __fish_pkg_subcommand -xa rquery -d "Query information for remote repositories"
+complete -c pkg -n __fish_pkg_subcommand -xa search -d "Find packages"
+complete -c pkg -n __fish_pkg_subcommand -xa set -d "Modify package information in database"
+complete -c pkg -n __fish_pkg_subcommand -xa shell -d "Open a SQLite shell"
+complete -c pkg -n __fish_pkg_subcommand -xa shlib -d "Display packages linking to shared library"
+complete -c pkg -n __fish_pkg_subcommand -xa show -d "Show information about package(s)"
+complete -c pkg -n __fish_pkg_subcommand -xa stats -d "Display package statistics"
+complete -c pkg -n __fish_pkg_subcommand -xa unlock -d "Stop preventing package modification"
+complete -c pkg -n __fish_pkg_subcommand -xa update -d "Update remote repositories"
+complete -c pkg -n __fish_pkg_subcommand -xa updating -d "Display UPDATING entries"
+complete -c pkg -n __fish_pkg_subcommand -xa upgrade -d "Upgrade packages"
+complete -c pkg -n __fish_pkg_subcommand -xa version -d "Show package versions"
+complete -c pkg -n __fish_pkg_subcommand -xa which -d "Check which package provides a file"
 
 # add
 complete -c pkg -n '__fish_pkg_is add install' -s A -l automatic -d "Mark packages as automatic"
diff --git a/share/completions/pkgfile.fish b/share/completions/pkgfile.fish
index dae11771a..0f993e190 100644
--- a/share/completions/pkgfile.fish
+++ b/share/completions/pkgfile.fish
@@ -1,12 +1,12 @@
-complete -c pkgfile -l version         -d 'show program\'s version number and exit'
-complete -c pkgfile -s h -l help       -d 'show this help message and exit'
-complete -c pkgfile -s b -l binaries   -d 'only show files in a {s}bin/ directory. Works with -s, -l'
-complete -c pkgfile -s c -l case-sensitive  -d 'make searches case sensitive'
-complete -c pkgfile -s g -l glob       -d 'allow the use of * and ? as wildcards'
-complete -c pkgfile -s r -l regex      -d 'allow the use of regex in searches'
-complete -c pkgfile -s R -l repo       -d 'search only in the specified repository' -xa '(__fish_print_pacman_repos)'
-complete -c pkgfile -s v -l verbose    -d 'enable verbose output'
-complete -c pkgfile -s i -l info       -d 'provides information about the package owning a file' -r
-complete -c pkgfile -s l -l list       -d 'list files of a given package; similar to "pacman -Ql"' -xa "(pacman -Sl | cut --delim ' ' --fields 2- | tr ' ' \t | sort)"
-complete -c pkgfile -s s -l search     -d 'search which package owns a file' -r
-complete -c pkgfile -s u -l update     -d 'update to the latest filelist. This requires write permission to /var/cache/pkgtools/lists'
+complete -c pkgfile -l version -d 'show program\'s version number and exit'
+complete -c pkgfile -s h -l help -d 'show this help message and exit'
+complete -c pkgfile -s b -l binaries -d 'only show files in a {s}bin/ directory. Works with -s, -l'
+complete -c pkgfile -s c -l case-sensitive -d 'make searches case sensitive'
+complete -c pkgfile -s g -l glob -d 'allow the use of * and ? as wildcards'
+complete -c pkgfile -s r -l regex -d 'allow the use of regex in searches'
+complete -c pkgfile -s R -l repo -d 'search only in the specified repository' -xa '(__fish_print_pacman_repos)'
+complete -c pkgfile -s v -l verbose -d 'enable verbose output'
+complete -c pkgfile -s i -l info -d 'provides information about the package owning a file' -r
+complete -c pkgfile -s l -l list -d 'list files of a given package; similar to "pacman -Ql"' -xa "(pacman -Sl | cut --delim ' ' --fields 2- | tr ' ' \t | sort)"
+complete -c pkgfile -s s -l search -d 'search which package owns a file' -r
+complete -c pkgfile -s u -l update -d 'update to the latest filelist. This requires write permission to /var/cache/pkgtools/lists'
diff --git a/share/completions/port.fish b/share/completions/port.fish
index 344335b02..18f0f8ddc 100644
--- a/share/completions/port.fish
+++ b/share/completions/port.fish
@@ -1,77 +1,77 @@
 #completion for port
 
 set -l subcommands activate archive build cat cd checksum clean configure \
-		contents deactivate dependents deps destroot dir distcheck dmg echo \
-		edit extract fetch file gohome info install installed lint list \
-		livecheck location load log logfile mirror mdmg mpkg notes outdated \
-		patch pkg provides rdependents rdeps reload rev search select \
-		selfupdate setrequested setunrequested sync test unarchive uninstall \
-		unload unsetrequested upgrade url usage variants version work
+    contents deactivate dependents deps destroot dir distcheck dmg echo \
+    edit extract fetch file gohome info install installed lint list \
+    livecheck location load log logfile mirror mdmg mpkg notes outdated \
+    patch pkg provides rdependents rdeps reload rev search select \
+    selfupdate setrequested setunrequested sync test unarchive uninstall \
+    unload unsetrequested upgrade url usage variants version work
 
 complete -c port -n "__fish_seen_subcommand_from $subcommands" -a '(__fish_print_packages)' --description 'Package'
 
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'activate'  --description 'Set  version of a port to active'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'archive'  --description "Create image for port without installing"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'build'  --description 'Run build phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cat'  --description 'Print the Portfile of the given port(s)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cd'  --description 'Change directory to that containing portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'checksum'  --description 'Compute checksums of distribution files'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'clean'  --description 'Remove temporary files used to build a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'configure'  --description 'Run configure phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'contents'  --description 'List the files installed by a given port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deactivate'  --description 'Set the status of a port to inactive'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dependents'  --description 'List ports that depend on a given port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deps'  --description 'Display a dependency listing for given port(s)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'destroot'  --description 'Run destroot phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dir'  --description 'print directory with Portfile for port expression'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'distcheck'  --description 'Check if port can be fetched from all mirrors'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dmg'  --description 'Create binary archives of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'echo'  --description 'Print the list of ports the argument expands to'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'edit'  --description 'Open the Portfile in an editor'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'extract'  --description 'Run extract phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'fetch'  --description 'Run fetch phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'file'  --description 'Display the path to the Portfile for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'help'  --description 'Get help on MacPorts commands'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'gohome'  --description 'Load home page for given portname in web browser'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'info'  --description 'Return information about the given ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'install'  --description 'Install a new port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'installed'  --description 'List installed versions (of port)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'lint'  --description 'Verifies Portfile for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'list'  --description 'List latest available version for given ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'livecheck'  --description 'Check if new version of software is available'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'location'  --description 'Print location of archive used for (de)activation'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'load'  --description "load a port's daemon"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'log'  --description 'Parse and show log files for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'logfile'  --description 'Display the path to the log file for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mirror'  --description 'Create/update local mirror of distfiles'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mdmg'  --description 'Create disk image of portname and dependencies'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mpkg'  --description 'Create binary archives of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'notes'  --description 'Displays notes for portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'outdated'  --description 'List outdated ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'patch'  --description 'Run patch phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'pkg'  --description 'Create binary archives of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'provides'  --description 'Find the port that installed a file'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdependents'  --description 'Recursively list ports depending on given port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdeps'  --description 'Display a recursive dependency listing of port(s)'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'reload'  --description "reload a port's daemon"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rev-upgrade'  --description 'Rebuild ports containing broken binaries'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'search'  --description 'Search for a port using keywords'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'select'  --description 'Selects a version to be the default'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'selfupdate'  --description 'Upgrade MacPorts and update list of ports'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setrequested'  --description 'Mark portname as requested'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setunrequested'  --description 'Mark portname as unrequested'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'sync'  --description 'Update the port definition files'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'test'  --description 'Run test phase of a port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unarchive'  --description 'Extract destroot of given ports from archive'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'uninstall'  --description 'Remove a previously installed port'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unload'  --description "Unload a port's daemon"
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unsetrequested'  --description 'Mark portname as unrequested'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'upgrade'  --description 'Upgrade a port to the latest version'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'url'  --description 'Display URL for path of given portname'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'usage'  --description 'Displays a condensed usage summary'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'variants'  --description 'Print list of variants with descriptions'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'version'  --description 'Print the MacPorts version'
-complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'work'  --description 'Displays path to work directory for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'activate' --description 'Set  version of a port to active'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'archive' --description "Create image for port without installing"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'build' --description 'Run build phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cat' --description 'Print the Portfile of the given port(s)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'cd' --description 'Change directory to that containing portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'checksum' --description 'Compute checksums of distribution files'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'clean' --description 'Remove temporary files used to build a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'configure' --description 'Run configure phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'contents' --description 'List the files installed by a given port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deactivate' --description 'Set the status of a port to inactive'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dependents' --description 'List ports that depend on a given port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'deps' --description 'Display a dependency listing for given port(s)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'destroot' --description 'Run destroot phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dir' --description 'print directory with Portfile for port expression'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'distcheck' --description 'Check if port can be fetched from all mirrors'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'dmg' --description 'Create binary archives of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'echo' --description 'Print the list of ports the argument expands to'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'edit' --description 'Open the Portfile in an editor'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'extract' --description 'Run extract phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'fetch' --description 'Run fetch phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'file' --description 'Display the path to the Portfile for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'help' --description 'Get help on MacPorts commands'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'gohome' --description 'Load home page for given portname in web browser'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'info' --description 'Return information about the given ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'install' --description 'Install a new port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'installed' --description 'List installed versions (of port)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'lint' --description 'Verifies Portfile for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'list' --description 'List latest available version for given ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'livecheck' --description 'Check if new version of software is available'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'location' --description 'Print location of archive used for (de)activation'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'load' --description "load a port's daemon"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'log' --description 'Parse and show log files for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'logfile' --description 'Display the path to the log file for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mirror' --description 'Create/update local mirror of distfiles'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mdmg' --description 'Create disk image of portname and dependencies'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'mpkg' --description 'Create binary archives of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'notes' --description 'Displays notes for portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'outdated' --description 'List outdated ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'patch' --description 'Run patch phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'pkg' --description 'Create binary archives of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'provides' --description 'Find the port that installed a file'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdependents' --description 'Recursively list ports depending on given port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rdeps' --description 'Display a recursive dependency listing of port(s)'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'reload' --description "reload a port's daemon"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'rev-upgrade' --description 'Rebuild ports containing broken binaries'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'search' --description 'Search for a port using keywords'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'select' --description 'Selects a version to be the default'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'selfupdate' --description 'Upgrade MacPorts and update list of ports'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setrequested' --description 'Mark portname as requested'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'setunrequested' --description 'Mark portname as unrequested'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'sync' --description 'Update the port definition files'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'test' --description 'Run test phase of a port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unarchive' --description 'Extract destroot of given ports from archive'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'uninstall' --description 'Remove a previously installed port'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unload' --description "Unload a port's daemon"
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'unsetrequested' --description 'Mark portname as unrequested'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'upgrade' --description 'Upgrade a port to the latest version'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'url' --description 'Display URL for path of given portname'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'usage' --description 'Displays a condensed usage summary'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'variants' --description 'Print list of variants with descriptions'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'version' --description 'Print the MacPorts version'
+complete -f -n "__fish_use_subcommand $subcommands" -c port -a 'work' --description 'Displays path to work directory for portname'
 
 complete -c port -s v --description 'Verbose mode, generates verbose messages'
 complete -c port -s d --description 'Debug mode, implies -v'
diff --git a/share/completions/psql.fish b/share/completions/psql.fish
index e5b6b4656..734fc759b 100644
--- a/share/completions/psql.fish
+++ b/share/completions/psql.fish
@@ -14,45 +14,45 @@ complete -c psql --no-files -a '(__fish_complete_pg_database)'
 # General options:
 #
 
-complete -c psql -s d -l dbname -a '(__fish_complete_pg_database)'      -d "database name to connect to"
-complete -c psql -s c -l command        -d "run only single command (SQL or internal) and exit"
-complete -c psql -s f -l file -r        -d "execute commands from file, then exit"
-complete -c psql -s l -l list           -d "list available databases, then exit"
+complete -c psql -s d -l dbname -a '(__fish_complete_pg_database)' -d "database name to connect to"
+complete -c psql -s c -l command -d "run only single command (SQL or internal) and exit"
+complete -c psql -s f -l file -r -d "execute commands from file, then exit"
+complete -c psql -s l -l list -d "list available databases, then exit"
 
 # complete -c psql -s v -l set=, --variable=NAME=VALUE
 #                                           set psql variable NAME to VALUE
 
-complete -c psql -s X -l no-psqlrc          -d "do not read startup file (~/.psqlrc)"
+complete -c psql -s X -l no-psqlrc -d "do not read startup file (~/.psqlrc)"
 complete -c psql -s 1 -l single-transaction -d "execute command file as a single transaction"
-complete -c psql -l help                    -d "show this help, then exit"
-complete -c psql -l version                 -d "output version information, then exit"
+complete -c psql -l help -d "show this help, then exit"
+complete -c psql -l version -d "output version information, then exit"
 
 #
 #   Input and output options:
 #
 
-complete -c psql -s a, -l echo-all           -d "echo all input from script"
-complete -c psql -s e, -l echo-queries       -d "echo commands sent to server"
-complete -c psql -s E, -l echo-hidden        -d "display queries that internal commands generate"
-complete -c psql -s L, -l log-file           -d "send session log to file"
-complete -c psql -s n, -l no-readline        -d "disable enhanced command line editing (readline)"
-complete -c psql -s o, -l output             -d "send query results to file (or |pipe)"
-complete -c psql -s q, -l quiet              -d "run quietly (no messages, only query output)"
-complete -c psql -s s, -l single-step        -d "single-step mode (confirm each query)"
-complete -c psql -s S, -l single-line        -d "single-line mode (end of line terminates SQL command)"
+complete -c psql -s a, -l echo-all -d "echo all input from script"
+complete -c psql -s e, -l echo-queries -d "echo commands sent to server"
+complete -c psql -s E, -l echo-hidden -d "display queries that internal commands generate"
+complete -c psql -s L, -l log-file -d "send session log to file"
+complete -c psql -s n, -l no-readline -d "disable enhanced command line editing (readline)"
+complete -c psql -s o, -l output -d "send query results to file (or |pipe)"
+complete -c psql -s q, -l quiet -d "run quietly (no messages, only query output)"
+complete -c psql -s s, -l single-step -d "single-step mode (confirm each query)"
+complete -c psql -s S, -l single-line -d "single-line mode (end of line terminates SQL command)"
 
 #
 #   Output format options:
 #
 
-complete -c psql -s A, -l no-align          -d "unaligned table output mode"
-complete -c psql -s H, -l html              -d "HTML table output mode"
-complete -c psql -s P, -l pset              -d "set printing option VAR to ARG (see \pset command)"
-complete -c psql -s t, -l tuples-only       -d "print rows only"
-complete -c psql -s T, -l table-attr        -d "set HTML table tag attributes (e.g., width, border)"
-complete -c psql -s x, -l expanded          -d "turn on expanded table output"
-complete -c psql -s F, -l field-separator   -d "set field separator (default: '|')"
-complete -c psql -s R, -l record-separator  -d "set record separator (default: newline)"
+complete -c psql -s A, -l no-align -d "unaligned table output mode"
+complete -c psql -s H, -l html -d "HTML table output mode"
+complete -c psql -s P, -l pset -d "set printing option VAR to ARG (see \pset command)"
+complete -c psql -s t, -l tuples-only -d "print rows only"
+complete -c psql -s T, -l table-attr -d "set HTML table tag attributes (e.g., width, border)"
+complete -c psql -s x, -l expanded -d "turn on expanded table output"
+complete -c psql -s F, -l field-separator -d "set field separator (default: '|')"
+complete -c psql -s R, -l record-separator -d "set record separator (default: newline)"
 
 
 #
diff --git a/share/completions/pushd.fish b/share/completions/pushd.fish
index d38dc298c..8694f5df9 100644
--- a/share/completions/pushd.fish
+++ b/share/completions/pushd.fish
@@ -1,5 +1,5 @@
 function __fish_complete_pushd_plus
-    if count $dirstack > /dev/null
+    if count $dirstack >/dev/null
         # print each member of the stack, replace $HOME with ~
         for i in (seq (count $dirstack))
             printf "+%s\t%s\n" $i "Rotate to "(string replace -r "^$HOME" "~" -- $dirstack[$i])
@@ -8,9 +8,9 @@ function __fish_complete_pushd_plus
 end
 
 function __fish_complete_pushd_minus
-    if count $dirstack > /dev/null
+    if count $dirstack >/dev/null
         # print each member of the stack, replace $HOME with ~
-		# Negative arguments are expected to start at "-0"
+        # Negative arguments are expected to start at "-0"
         for i in (seq (count $dirstack) -1 1)
             printf "%s\t%s\n" -(math $i - 1) "Rotate to "(string replace -r "^$HOME" "~" -- $dirstack[(math -$i)])
         end
@@ -18,7 +18,7 @@ function __fish_complete_pushd_minus
 end
 
 function __fish_complete_pushd_swap
-    if count $dirstack > /dev/null
+    if count $dirstack >/dev/null
         # replace $HOME with ~
         printf "\t%s\n" "Swap with "(string replace -r "^$HOME" "~" -- $dirstack[1])
     end
diff --git a/share/completions/pydf.fish b/share/completions/pydf.fish
index 69d2a3157..2fd44331e 100644
--- a/share/completions/pydf.fish
+++ b/share/completions/pydf.fish
@@ -1,18 +1,18 @@
 
 complete -c pydf -r -d 'Report colourised filesystem disk space usage'
-complete -c pydf -l help               -d 'show this help message'
-complete -c pydf -s v -l version         -d 'show version'
-complete -c pydf -s a -l all             -d 'include filesystems having 0 blocks'
-complete -c pydf -s h -l human-readable  -d 'print sizes in human readable format (e.g., 1K 234M 2G)'
-complete -c pydf -s H -l si              -d 'likewise, but use powers of 1000 not 1024'
-complete -c pydf -s b -l block-size -x  -d 'use BLOCKSIZE-byte blocks'
-complete -c pydf -s l -l local           -d 'limit listing to local filesystems'
-complete -c pydf -s k -l kilobytes       -d 'like --block-size=1024'
-complete -c pydf -s m -l megabytes       -d 'like --block-size=1048576'
-complete -c pydf -s g -l gigabytes       -d 'like --block-size=1073741824'
-complete -c pydf -l blocks             -d 'use filesystem native block size'
-complete -c pydf -l bw                 -d 'do not use colours'
-complete -c pydf -l mounts -r          -d 'file to get mount information from. On normal Linux systems only /etc/mtab or /proc/mounts make sense. Some other Unices use /etc/mnttab. Use /proc/mounts when /etc/mtab is corrupted or inaccessible (the output looks a bit weird in this case).'
-complete -c pydf -s B -l show-binds      -d 'show \'mount --bind\' mounts'
-complete -c pydf -s i -l inodes          -d 'show inode instead of block usage'
+complete -c pydf -l help -d 'show this help message'
+complete -c pydf -s v -l version -d 'show version'
+complete -c pydf -s a -l all -d 'include filesystems having 0 blocks'
+complete -c pydf -s h -l human-readable -d 'print sizes in human readable format (e.g., 1K 234M 2G)'
+complete -c pydf -s H -l si -d 'likewise, but use powers of 1000 not 1024'
+complete -c pydf -s b -l block-size -x -d 'use BLOCKSIZE-byte blocks'
+complete -c pydf -s l -l local -d 'limit listing to local filesystems'
+complete -c pydf -s k -l kilobytes -d 'like --block-size=1024'
+complete -c pydf -s m -l megabytes -d 'like --block-size=1048576'
+complete -c pydf -s g -l gigabytes -d 'like --block-size=1073741824'
+complete -c pydf -l blocks -d 'use filesystem native block size'
+complete -c pydf -l bw -d 'do not use colours'
+complete -c pydf -l mounts -r -d 'file to get mount information from. On normal Linux systems only /etc/mtab or /proc/mounts make sense. Some other Unices use /etc/mnttab. Use /proc/mounts when /etc/mtab is corrupted or inaccessible (the output looks a bit weird in this case).'
+complete -c pydf -s B -l show-binds -d 'show \'mount --bind\' mounts'
+complete -c pydf -s i -l inodes -d 'show inode instead of block usage'
 
diff --git a/share/completions/python.fish b/share/completions/python.fish
index dfd127a2e..4a01a0cda 100644
--- a/share/completions/python.fish
+++ b/share/completions/python.fish
@@ -25,5 +25,5 @@ complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s2"' -s t -d "Warn
 complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s2"' -s Q -x -a "old new warn warnall" -d "Division control"
 complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -s q -d 'Don\'t print version and copyright messages on interactive startup'
 complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -s X -x -d 'Set implementation-specific option'
-complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -s b  -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
+complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -s b -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
 complete -c python -n 'python -V 2>&1 | string match -rq "^.*\s3"' -o bb -d 'Issue errors'
diff --git a/share/completions/python3.fish b/share/completions/python3.fish
index ea6cf259b..2113bd0dd 100644
--- a/share/completions/python3.fish
+++ b/share/completions/python3.fish
@@ -17,7 +17,7 @@ complete -c python3 -n '__fish_is_first_token' -fa "(__fish_complete_suffix .py)
 complete -c python3 -f -n '__fish_is_first_token' -a '-' -d 'Read program from stdin'
 complete -c python3 -s q -d 'Don\'t print version and copyright messages on interactive startup'
 complete -c python3 -s X -x -d 'Set implementation-specific option'
-complete -c python3 -s b  -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
+complete -c python3 -s b -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
 complete -c python3 -o bb -d 'Issue errors'
 complete -c python3 -s m -d 'Run library module as a script (terminates option list)' -xa '(python3 -c "import pkgutil; print(\'\n\'.join([p[1] for p in pkgutil.iter_modules()]))")'
 
diff --git a/share/completions/quilt.fish b/share/completions/quilt.fish
index 6bf353cca..7607d0da6 100644
--- a/share/completions/quilt.fish
+++ b/share/completions/quilt.fish
@@ -21,7 +21,7 @@ complete -c quilt -a mail -r -d "Create  mail  messages  from all patches in the
 complete -c quilt -a new -r -d "Create a new patch with the specified file name, and  insert  it after the topmost patch"
 complete -c quilt -a next -r -d "Print  the  name  of  the next patch after the specified or topmost patch in the series file"
 complete -c quilt -a patches -r -d "Print the list of patches that modify the specified file"
-complete -c quilt -a pop -r -d  "Remove  patch(es) from the stack of applied  patches"
+complete -c quilt -a pop -r -d "Remove  patch(es) from the stack of applied  patches"
 complete -c quilt -a previous -r -d "Print the name of the previous patch before the specified or topmost patch in the series file"
 complete -c quilt -a push -r -d "Apply patch(es) from the series file"
 complete -c quilt -a refresh -r -d "Refreshes the specified patch, or the topmost patch by default"
diff --git a/share/completions/rbenv.fish b/share/completions/rbenv.fish
index bfec90c41..dec9fd175 100644
--- a/share/completions/rbenv.fish
+++ b/share/completions/rbenv.fish
@@ -1,44 +1,44 @@
 # fish completion for rbenv
 
 function __fish_rbenv_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
 
-  return 1
+    return 1
 end
 
 function __fish_rbenv_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 function __fish_rbenv_executables
-  rbenv exec --complete
+    rbenv exec --complete
 end
 
 function __fish_rbenv_installed_rubies
-  rbenv versions --bare
+    rbenv versions --bare
 end
 
 function __fish_rbenv_official_rubies
-	if command -sq ruby-build
-		ruby-build --definitions
-	else
-		# Remove trailing spaces, otherwise completion options appear like
-		# "\ \ option"
-		rbenv install --list | sed "s/^[[:space:]]*//"
-	end
+    if command -sq ruby-build
+        ruby-build --definitions
+    else
+        # Remove trailing spaces, otherwise completion options appear like
+        # "\ \ option"
+        rbenv install --list | sed "s/^[[:space:]]*//"
+    end
 end
 
 function __fish_rbenv_prefixes
-  rbenv prefix --complete
+    rbenv prefix --complete
 end
 
 ### commands
@@ -92,7 +92,7 @@ complete -f -c rbenv -n '__fish_rbenv_needs_command' -a shims
 complete -f -c rbenv -n '__fish_rbenv_using_command shims' -a '--short'
 
 ### version
-complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version  -d 'Show the current Ruby version'
+complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version -d 'Show the current Ruby version'
 
 ### version-file
 complete -f -c rbenv -n '__fish_rbenv_needs_command' -a version-file
diff --git a/share/completions/readlink.fish b/share/completions/readlink.fish
index c644e8f3c..68f4776d7 100644
--- a/share/completions/readlink.fish
+++ b/share/completions/readlink.fish
@@ -1,9 +1,9 @@
 
-complete -c readlink -s f -l canonicalize          -d 'Canonicalize, follow symlinks, last can be missing'
+complete -c readlink -s f -l canonicalize -d 'Canonicalize, follow symlinks, last can be missing'
 complete -c readlink -s e -l canonicalize-existing -d 'Canonicalize, follow symlinks, none can be missing'
-complete -c readlink -s m -l canonicalize-missing  -d 'Canonicalize, follow symlinks, all can be missing'
-complete -c readlink -s n -l no-newline            -d 'Do not output the trailing newline'
-complete -c readlink -s q -l quiet -s s -l silent  -d 'Suppress most error messages'
-complete -c readlink -s v -l verbose               -d 'Report error messages'
-complete -c readlink      -l help                  -d 'Display this help and exit'
-complete -c readlink      -l version               -d 'Output version information and exit'
+complete -c readlink -s m -l canonicalize-missing -d 'Canonicalize, follow symlinks, all can be missing'
+complete -c readlink -s n -l no-newline -d 'Do not output the trailing newline'
+complete -c readlink -s q -l quiet -s s -l silent -d 'Suppress most error messages'
+complete -c readlink -s v -l verbose -d 'Report error messages'
+complete -c readlink -l help -d 'Display this help and exit'
+complete -c readlink -l version -d 'Output version information and exit'
diff --git a/share/completions/realpath.fish b/share/completions/realpath.fish
index bad7d417d..944683886 100644
--- a/share/completions/realpath.fish
+++ b/share/completions/realpath.fish
@@ -1,11 +1,11 @@
-complete -c realpath -s e -l canonicalize-existing  -d 'all components of the path must exist'
-complete -c realpath -s m -l canonicalize-missing   -d 'no components of the path need exist'
-complete -c realpath -s L -l logical                -d 'resolve \'..\' components before symlinks'
-complete -c realpath -s P -l physical               -d 'resolve symlinks as encountered (default)'
-complete -c realpath -s q -l quiet                  -d 'suppress most error messages'
-complete -c realpath -l relative-to -r              -d 'print the resolved path relative to FILE'
-complete -c realpath -l relative-base -r            -d 'print absolute paths unless paths below FILE'
-complete -c realpath -s s -l strip -l no-symlinks   -d 'don\'t expand symlinks'
-complete -c realpath -s z -l zero                   -d 'separate output with NUL rather than newline'
-complete -c realpath -l help     -d 'display this help and exit'
-complete -c realpath -l version  -d 'output version information and exit'
+complete -c realpath -s e -l canonicalize-existing -d 'all components of the path must exist'
+complete -c realpath -s m -l canonicalize-missing -d 'no components of the path need exist'
+complete -c realpath -s L -l logical -d 'resolve \'..\' components before symlinks'
+complete -c realpath -s P -l physical -d 'resolve symlinks as encountered (default)'
+complete -c realpath -s q -l quiet -d 'suppress most error messages'
+complete -c realpath -l relative-to -r -d 'print the resolved path relative to FILE'
+complete -c realpath -l relative-base -r -d 'print absolute paths unless paths below FILE'
+complete -c realpath -s s -l strip -l no-symlinks -d 'don\'t expand symlinks'
+complete -c realpath -s z -l zero -d 'separate output with NUL rather than newline'
+complete -c realpath -l help -d 'display this help and exit'
+complete -c realpath -l version -d 'output version information and exit'
diff --git a/share/completions/rm.fish b/share/completions/rm.fish
index 5ca66833d..9a32bd434 100644
--- a/share/completions/rm.fish
+++ b/share/completions/rm.fish
@@ -1,38 +1,38 @@
 #Completions for rm
 if rm --version >/dev/null 2>/dev/null # GNU
-	complete -c rm -s d -l directory -d "Unlink directories"
-	complete -c rm -s f -l force -d "Never prompt for removal"
-	complete -c rm -s i -l interactive -d "Prompt for removal"
-	complete -c rm -s I -d "Prompt to remove >3 files"
-	complete -c rm -s r -l recursive -d "Recursively remove subdirs"
-	complete -c rm -s R -d "Recursively remove subdirs"
-	complete -c rm -s v -l verbose -d "Explain what is done"
-	complete -c rm -s h -l help -d "Display help"
-	complete -c rm -l version -d "Display rm version"
+    complete -c rm -s d -l directory -d "Unlink directories"
+    complete -c rm -s f -l force -d "Never prompt for removal"
+    complete -c rm -s i -l interactive -d "Prompt for removal"
+    complete -c rm -s I -d "Prompt to remove >3 files"
+    complete -c rm -s r -l recursive -d "Recursively remove subdirs"
+    complete -c rm -s R -d "Recursively remove subdirs"
+    complete -c rm -s v -l verbose -d "Explain what is done"
+    complete -c rm -s h -l help -d "Display help"
+    complete -c rm -l version -d "Display rm version"
 else
-	set -l uname (uname -s)
-	# solaris:   rm [-fi        ] file ...
-	# openbsd:   rm [-fidPRrv   ] file ...
-	# macos:     rm [-fidPRrvW  ] file ...
-	# netbsd:    rm [-fidPRrvWx ] file ...
-	# freebsd:   rm [-fidPRrvWxI] file ...
-	# dragonfly: rm [-fidPRrvWxI] file ... 
+    set -l uname (uname -s)
+    # solaris:   rm [-fi        ] file ...
+    # openbsd:   rm [-fidPRrv   ] file ...
+    # macos:     rm [-fidPRrvW  ] file ...
+    # netbsd:    rm [-fidPRrvWx ] file ...
+    # freebsd:   rm [-fidPRrvWxI] file ...
+    # dragonfly: rm [-fidPRrvWxI] file ... 
 
-	complete -c rm -s f -d "Never prompt for removal"
-	complete -c rm -s i -d "Prompt for removal"
-	test "$uname" = SunOS
-		and exit 0
-	complete -c rm -s d -d "Remove directories as well"
-	complete -c rm -s P -d "Overwrite before removal"
-	complete -c rm -s R -s r -d "Recursively remove subdirs"
-	complete -c rm -s v -d "Explain what is done"
-	test "$uname" = OpenBSD
-		and exit 0
-	complete -c rm -s W -d "Undelete given filenames"
-	test "$uname" = Darwin
-		and exit 0
-	complete -c rm -s x -d "Don't traverse mount points"
-	test "$uname" = NetBSD
-		and exit 0
-	complete -c rm -s I -d "Prompt to remove >=3 files"
+    complete -c rm -s f -d "Never prompt for removal"
+    complete -c rm -s i -d "Prompt for removal"
+    test "$uname" = SunOS
+    and exit 0
+    complete -c rm -s d -d "Remove directories as well"
+    complete -c rm -s P -d "Overwrite before removal"
+    complete -c rm -s R -s r -d "Recursively remove subdirs"
+    complete -c rm -s v -d "Explain what is done"
+    test "$uname" = OpenBSD
+    and exit 0
+    complete -c rm -s W -d "Undelete given filenames"
+    test "$uname" = Darwin
+    and exit 0
+    complete -c rm -s x -d "Don't traverse mount points"
+    test "$uname" = NetBSD
+    and exit 0
+    complete -c rm -s I -d "Prompt to remove >=3 files"
 end
diff --git a/share/completions/rmmod.fish b/share/completions/rmmod.fish
index 3f6dff165..4f03e9890 100644
--- a/share/completions/rmmod.fish
+++ b/share/completions/rmmod.fish
@@ -1,8 +1,8 @@
 # rmmod completion
 complete -c rmmod -x -a "(/sbin/lsmod | awk 'NR > 1 {print \$1}')"
 
-complete -c rmmod -s h -l help    -d "Prints the help text."
-complete -c rmmod -s s -l syslog  -d "Send errors to syslog instead of standard error."
+complete -c rmmod -s h -l help -d "Prints the help text."
+complete -c rmmod -s s -l syslog -d "Send errors to syslog instead of standard error."
 complete -c rmmod -s v -l verbose -d "Print messages about what the program is doing."
 complete -c rmmod -s V -l version -d "Show version of program and exit"
-complete -c rmmod -s f -l force   -d "With this option, you can remove modules which are being used, or which are not designed to be removed, or have been marked as unsafe"
+complete -c rmmod -s f -l force -d "With this option, you can remove modules which are being used, or which are not designed to be removed, or have been marked as unsafe"
diff --git a/share/completions/ruby-build.fish b/share/completions/ruby-build.fish
index 2489a09f1..f596dc693 100644
--- a/share/completions/ruby-build.fish
+++ b/share/completions/ruby-build.fish
@@ -1,13 +1,13 @@
 function __fish_ruby-build_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 function __fish_ruby-build_definitions
-  ruby-build --definitions
+    ruby-build --definitions
 end
 
 complete -f -c ruby-build -n '__fish_ruby-build_needs_command' -a '(__fish_ruby-build_definitions)' -d 'Definition'
diff --git a/share/completions/s3cmd.fish b/share/completions/s3cmd.fish
index 7e8cd06ff..545576e0e 100644
--- a/share/completions/s3cmd.fish
+++ b/share/completions/s3cmd.fish
@@ -1,11 +1,11 @@
 # s3cmd
 
 function __s3cmd_is_remote_path
-	commandline -pct | string match -q -r -- "^s3://.*"
+    commandline -pct | string match -q -r -- "^s3://.*"
 end
 
 function __s3cmd_is_valid_remote_path
-	commandline -pct | string match -q -r -- "^s3://.*?/.*"
+    commandline -pct | string match -q -r -- "^s3://.*?/.*"
 end
 
 # Completions to allow for autocomplete of remote paths
diff --git a/share/completions/sbt.fish b/share/completions/sbt.fish
index 5332cfbd0..341700eea 100644
--- a/share/completions/sbt.fish
+++ b/share/completions/sbt.fish
@@ -33,7 +33,7 @@ complete -c sbt -f -a '(string split "\n" "
     and not contains -- "client" (commandline -cpo)'
 
 # These cannot be combined with any other commands and require an argument
-complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'new'    -d 'Create a new sbt project from the given template'
+complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'new' -d 'Create a new sbt project from the given template'
 complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'client' -d 'Connect to a server with an interactive sbt prompt'
 
 
@@ -44,31 +44,31 @@ complete -c sbt -f -n '[ (count (commandline -cpo)) = 1 ]' -a 'client' -d 'Conne
 # This is based on the output of `sbt -help`:
 
 # general options without arguments
-complete -c sbt -o help    -s h  -f -d "Print options help message"
-complete -c sbt -o verbose -s v  -f -d "Print more details"
-complete -c sbt -o debug   -s d  -f -d "Set log level to debug"
-complete -c sbt -o no-colors     -f -d "Disable ANSI color codes"
-complete -c sbt -o sbt-create    -f -d "Launch even if there's no sbt project"
-complete -c sbt -o no-share      -f -d "Use all local caches"
-complete -c sbt -o no-global     -f -d "Use global caches, but not global ~/.sbt directory"
-complete -c sbt -o batch         -f -d "Disable interactive mode"
+complete -c sbt -o help -s h -f -d "Print options help message"
+complete -c sbt -o verbose -s v -f -d "Print more details"
+complete -c sbt -o debug -s d -f -d "Set log level to debug"
+complete -c sbt -o no-colors -f -d "Disable ANSI color codes"
+complete -c sbt -o sbt-create -f -d "Launch even if there's no sbt project"
+complete -c sbt -o no-share -f -d "Use all local caches"
+complete -c sbt -o no-global -f -d "Use global caches, but not global ~/.sbt directory"
+complete -c sbt -o batch -f -d "Disable interactive mode"
 
 # general options with arguments
-complete -c sbt -o sbt-dir  -d "Specify path to global settings/plugins"       -r # path
-complete -c sbt -o sbt-boot -d "Specify path to shared boot directory"         -r # path
-complete -c sbt -o ivy      -d "Specify path to local Ivy repository"          -r # path
-complete -c sbt -o mem      -d "Set memory options"                            -x # integer? (default: -Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m)
-complete -c sbt -o port     -d "Turn on JVM debugging, open at the given port" -r # port
+complete -c sbt -o sbt-dir -d "Specify path to global settings/plugins" -r # path
+complete -c sbt -o sbt-boot -d "Specify path to shared boot directory" -r # path
+complete -c sbt -o ivy -d "Specify path to local Ivy repository" -r # path
+complete -c sbt -o mem -d "Set memory options" -x # integer? (default: -Xms1024m -Xmx1024m -XX:ReservedCodeCacheSize=128m -XX:MaxPermSize=256m)
+complete -c sbt -o port -d "Turn on JVM debugging, open at the given port" -r # port
 
 # sbt version
-complete -c sbt -o sbt-version  -d "Use specified version of sbt"          -x -a '0.13.(seq 0 6)\t"" 1.0.0\t""'
-complete -c sbt -o sbt-jar      -d "Use specified jar as the sbt launcher" -r # jar path
-complete -c sbt -o sbt-rc       -d "Use an RC version of sbt"              -f
-complete -c sbt -o sbt-snapshot -d "Use a snapshot version of sbt"         -f
+complete -c sbt -o sbt-version -d "Use specified version of sbt" -x -a '0.13.(seq 0 6)\t"" 1.0.0\t""'
+complete -c sbt -o sbt-jar -d "Use specified jar as the sbt launcher" -r # jar path
+complete -c sbt -o sbt-rc -d "Use an RC version of sbt" -f
+complete -c sbt -o sbt-snapshot -d "Use a snapshot version of sbt" -f
 
 # java-related
-complete -c sbt -o java-home -d "Alternate JAVA_HOME"                         -r # path
-complete -c sbt -o D         -d "Pass -D option directly to the Java runtime" -x # -Dkey=val
-complete -c sbt -o J-X       -d "Pass -X option directly to the Java runtime" -x # -X*
-complete -c sbt -o S-X       -d "Pass -X option to sbt's scalacOptions"       -x # -X*
+complete -c sbt -o java-home -d "Alternate JAVA_HOME" -r # path
+complete -c sbt -o D -d "Pass -D option directly to the Java runtime" -x # -Dkey=val
+complete -c sbt -o J-X -d "Pass -X option directly to the Java runtime" -x # -X*
+complete -c sbt -o S-X -d "Pass -X option to sbt's scalacOptions" -x # -X*
 # TODO: list available -X options if it's possible to do in an automatic way
diff --git a/share/completions/scanimage.fish b/share/completions/scanimage.fish
index cb65d650a..98f809ce9 100644
--- a/share/completions/scanimage.fish
+++ b/share/completions/scanimage.fish
@@ -25,16 +25,16 @@ complete -c scanimage -s b -l batch -d 'Working in batch mode, FORMAT is \'out%d
 complete -c scanimage -l batch-start -r -d 'Page number to start naming files with'
 complete -c scanimage -l batch-count -r -d 'How many pages to scan in batch mode'
 complete -c scanimage -l batch-increment -r -d 'Increase page number in filename by #'
-complete -c scanimage -l batch-double       -d 'Increment page number by two'
-complete -c scanimage -l batch-prompt       -d 'Ask for pressing a key before scanning a page'
+complete -c scanimage -l batch-double -d 'Increment page number by two'
+complete -c scanimage -l batch-prompt -d 'Ask for pressing a key before scanning a page'
 
-complete -c scanimage -l accept-md5-only    -d 'Only accept authorization requests using md5'
-complete -c scanimage -s p -l progress      -d 'Print progress messages'
-complete -c scanimage -s n -l dont-scan     -d 'Only set options, don\'t actually scan'
-complete -c scanimage -s T -l test          -d 'Test backend thoroughly'
-complete -c scanimage -s A -l all-options   -d 'List all available backend options'
-complete -c scanimage -s h -l help          -d 'Display this help message and exit'
-complete -c scanimage -s v -l verbose       -d 'Give even more status messages'
+complete -c scanimage -l accept-md5-only -d 'Only accept authorization requests using md5'
+complete -c scanimage -s p -l progress -d 'Print progress messages'
+complete -c scanimage -s n -l dont-scan -d 'Only set options, don\'t actually scan'
+complete -c scanimage -s T -l test -d 'Test backend thoroughly'
+complete -c scanimage -s A -l all-options -d 'List all available backend options'
+complete -c scanimage -s h -l help -d 'Display this help message and exit'
+complete -c scanimage -s v -l verbose -d 'Give even more status messages'
 complete -c scanimage -s B -l buffer-size -r -d 'Change input buffer size (in kB, default 32)'
-complete -c scanimage -s V -l version       -d 'Print version information'
+complete -c scanimage -s V -l version -d 'Print version information'
 
diff --git a/share/completions/screen.fish b/share/completions/screen.fish
index bf968b1bc..392ec44ea 100644
--- a/share/completions/screen.fish
+++ b/share/completions/screen.fish
@@ -6,7 +6,7 @@ function __fish_detect_screen_socket_dir -d "Detect which folder screen uses"
 end
 
 function __fish_complete_screen_general_list_mac -d "Get the socket list on mac"
-    pushd $__fish_screen_socket_dir > /dev/null
+    pushd $__fish_screen_socket_dir >/dev/null
     set -l sockets (ls)
     if test (count $sockets) -ne 0
         switch $argv
@@ -16,7 +16,7 @@ function __fish_complete_screen_general_list_mac -d "Get the socket list on mac"
                 stat -f "%Lp %SB %N" -t "%D %T" $sockets | string match -r '^7\d{2} .*$' | string replace -r '^7\d{2} (\S+ \S+) (\S+)' '$2\t$1 Attached'
         end
     end
-    popd > /dev/null
+    popd >/dev/null
 end
 
 function __fish_complete_screen_general_list -d "Get the socket list"
diff --git a/share/completions/scss.fish b/share/completions/scss.fish
index f0d8f9ed9..0b8765693 100644
--- a/share/completions/scss.fish
+++ b/share/completions/scss.fish
@@ -45,7 +45,7 @@ complete -c scss -l sass -d "Use the indented Sass syntax."
 #                                        inline: include the source text in the sourcemap
 #                                        none: no sourcemaps
 complete -c scss -l sourcemap -x -d "How to link generated output to the source files." -a \
-"auto\t'(default) relative paths where possible, file URIs elsewhere'
+    "auto\t'(default) relative paths where possible, file URIs elsewhere'
 file\t'always absolute file URIs'
 inline\t'include the source text in the sourcemap'
 none\t'no sourcemaps'"
diff --git a/share/completions/sed.fish b/share/completions/sed.fish
index e4dd44c9c..732d01b47 100644
--- a/share/completions/sed.fish
+++ b/share/completions/sed.fish
@@ -16,23 +16,23 @@ __fish_gnu_complete -c sed -s i -l in-place -d "Edit files in place" $is_gnu
 
 if test -n "$is_gnu"
 
-	# GNU specific features
+    # GNU specific features
 
-	complete -c sed -l silent -d "Silent mode"
-	complete -c sed -s l -l line-length -x -d "Specify line-length"
-	complete -c sed -l posix -d "Disable all GNU extensions"
-	complete -c sed -s r -l regexp-extended -d "Use extended regexp"
-	complete -c sed -s s -l separate -d "Consider files as separate"
-	complete -c sed -s u -l unbuffered -d "Use minimal IO buffers"
-	complete -c sed -l help -d "Display help and exit"
-	complete -c sed -s V -l version -d "Display version and exit"
+    complete -c sed -l silent -d "Silent mode"
+    complete -c sed -s l -l line-length -x -d "Specify line-length"
+    complete -c sed -l posix -d "Disable all GNU extensions"
+    complete -c sed -s r -l regexp-extended -d "Use extended regexp"
+    complete -c sed -s s -l separate -d "Consider files as separate"
+    complete -c sed -s u -l unbuffered -d "Use minimal IO buffers"
+    complete -c sed -l help -d "Display help and exit"
+    complete -c sed -s V -l version -d "Display version and exit"
 
 else
 
-	# If not a GNU system, assume we have standard BSD ls features instead
+    # If not a GNU system, assume we have standard BSD ls features instead
 
-	complete -c sed -s E -d "Use extended regexp"
-	complete -c sed -s a -d "Delay opening files until a command containing the related 'w' function is applied"
-	complete -c sed -s l -d "Use line buffering"
+    complete -c sed -s E -d "Use extended regexp"
+    complete -c sed -s a -d "Delay opening files until a command containing the related 'w' function is applied"
+    complete -c sed -s l -d "Use line buffering"
 
 end
diff --git a/share/completions/seq.fish b/share/completions/seq.fish
index e7fe74cae..6b8833db5 100644
--- a/share/completions/seq.fish
+++ b/share/completions/seq.fish
@@ -1,12 +1,12 @@
-if seq --version 2>/dev/null > /dev/null #GNU
-	complete -c seq -s f -l format -d 'Use printf style floating-point FORMAT'
-	complete -c seq -s s -l separator -d 'Use STRING to separate numbers'
-	complete -c seq -s w -l equal-width -d 'Equalize width with leading zeroes'
-	complete -c seq -l help -d 'Display this help'
-	complete -c seq -l version -d 'Output version information'
+if seq --version 2>/dev/null >/dev/null #GNU
+    complete -c seq -s f -l format -d 'Use printf style floating-point FORMAT'
+    complete -c seq -s s -l separator -d 'Use STRING to separate numbers'
+    complete -c seq -s w -l equal-width -d 'Equalize width with leading zeroes'
+    complete -c seq -l help -d 'Display this help'
+    complete -c seq -l version -d 'Output version information'
 else #OS X
-	complete -c seq -s f -d 'Use printf style floating-point FORMAT'
-	complete -c seq -s s -d 'Use STRING to separate numbers'
-	complete -c seq -s w -d 'Equalize width with leading zeroes'
-	complete -c seq -s t -d 'Use STRING to terminate sequence of numbers'
+    complete -c seq -s f -d 'Use printf style floating-point FORMAT'
+    complete -c seq -s s -d 'Use STRING to separate numbers'
+    complete -c seq -s w -d 'Equalize width with leading zeroes'
+    complete -c seq -s t -d 'Use STRING to terminate sequence of numbers'
 end
diff --git a/share/completions/service.fish b/share/completions/service.fish
index 06265c44f..fbf16dd22 100644
--- a/share/completions/service.fish
+++ b/share/completions/service.fish
@@ -3,23 +3,23 @@ complete -c service -n "__fish_is_first_token" -xa "(__fish_print_service_names)
 
 # as found in __fish_print_service_names.fish
 if test -d /run/systemd/system # Systemd systems
-	complete -c service -n "not __fish_is_first_token" -xa "start stop restart status enable disable"
+    complete -c service -n "not __fish_is_first_token" -xa "start stop restart status enable disable"
 else if type -f rc-service 2>/dev/null # OpenRC (Gentoo)
-	complete -c service -n "not __fish_is_first_token" -xa "start stop restart"
+    complete -c service -n "not __fish_is_first_token" -xa "start stop restart"
 else if test -d /etc/init.d # SysV on Debian and other linuxen
-	complete -c service -n "not __fish_is_first_token" -xa "start stop --full-restart"
+    complete -c service -n "not __fish_is_first_token" -xa "start stop --full-restart"
 else # FreeBSD
-	# Use the output of `service -v foo` to retrieve the list of service-specific verbs
-	complete -c service -n "not __fish_is_first_token" -xa "(__fish_complete_freebsd_service_actions)"
+    # Use the output of `service -v foo` to retrieve the list of service-specific verbs
+    complete -c service -n "not __fish_is_first_token" -xa "(__fish_complete_freebsd_service_actions)"
 end
 
 function __fish_complete_freebsd_service_actions
-	# Use the output of `service -v foo` to retrieve the list of service-specific verbs
-	# Output takes the form "[prefix1 prefix2 ..](cmd1 cmd2 cmd3)" where any combination
-	# of zero or one prefixe(s) and any one command is a valid verb.
-	set -l service_name (commandline --tokenize --cut-at-cursor)[-1]
-	set -l results (service $service_name -v 2>| string match -r '\\[(.*)\\]\\((.*)\\)')
-	set -l prefixes "" (string split '|' -- $results[2])
-	set -l commands (string split '|' -- $results[3])
-	printf '%s\n' $prefixes$commands
+    # Use the output of `service -v foo` to retrieve the list of service-specific verbs
+    # Output takes the form "[prefix1 prefix2 ..](cmd1 cmd2 cmd3)" where any combination
+    # of zero or one prefixe(s) and any one command is a valid verb.
+    set -l service_name (commandline --tokenize --cut-at-cursor)[-1]
+    set -l results (service $service_name -v 2>| string match -r '\\[(.*)\\]\\((.*)\\)')
+    set -l prefixes "" (string split '|' -- $results[2])
+    set -l commands (string split '|' -- $results[3])
+    printf '%s\n' $prefixes$commands
 end
diff --git a/share/completions/set.fish b/share/completions/set.fish
index 757fa6009..3966638e4 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -13,40 +13,40 @@ set -g __fish_locale_vars LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETAR
 #
 
 function __fish_set_is_color -d 'Test if We are specifying a color value for the prompt'
-	set cmd (commandline -poc)
-	set -e cmd[1]
-	for i in $cmd
-		switch $i
+    set cmd (commandline -poc)
+    set -e cmd[1]
+    for i in $cmd
+        switch $i
 
-			case 'fish_color_*' 'fish_pager_color_*'
-				return 0
+            case 'fish_color_*' 'fish_pager_color_*'
+                return 0
 
-			case '-*'
+            case '-*'
 
-			case '*'
-				 return 1
-		end
-	end
-	return 1
+            case '*'
+                return 1
+        end
+    end
+    return 1
 end
 
 function __fish_set_is_locale -d 'Test if We are specifying a locale value for the prompt'
-	set cmd (commandline -poc)
-	set -e cmd[1]
-	for i in $cmd
-		switch $i
+    set cmd (commandline -poc)
+    set -e cmd[1]
+    for i in $cmd
+        switch $i
 
-			case $__fish_locale_vars
-				return 0
+            case $__fish_locale_vars
+                return 0
 
-			case '-*'
-				continue
+            case '-*'
+                continue
 
-			case '*'
-				 return 1
-		end
-	end
-	return 1
+            case '*'
+                return 1
+        end
+    end
+    return 1
 end
 
 #
diff --git a/share/completions/setfacl.fish b/share/completions/setfacl.fish
index 456dce4ae..4352a5f12 100644
--- a/share/completions/setfacl.fish
+++ b/share/completions/setfacl.fish
@@ -1,42 +1,42 @@
 set __fish_facl_spec_keywords default user group mask other
 
 function __fish_facl_list_spec_keyword
-  for keyword in $__fish_facl_spec_keywords
-    echo $keyword:
-  end
+    for keyword in $__fish_facl_spec_keywords
+        echo $keyword:
+    end
 end
 
 function __fish_facl_starts_with_spec_user
-  commandline -ct | string match -r "u(ser)?:"
+    commandline -ct | string match -r "u(ser)?:"
 end
 
 function __fish_facl_starts_with_spec_group
-  commandline -ct | string match -r "g(roup)?:"
+    commandline -ct | string match -r "g(roup)?:"
 end
 
 function __fish_facl_extract_acl
-  commandline -ct | string replace -ar '.*(\w*:).*' '$1'
+    commandline -ct | string replace -ar '.*(\w*:).*' '$1'
 end
 
-complete -c setfacl    -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_user'  -a '(__fish_facl_extract_acl)(__fish_complete_users  | string replace -a "\t" ":\t")'
-complete -c setfacl    -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_group' -a '(__fish_facl_extract_acl)(__fish_complete_groups | string replace -a "\t" ":\t")'
+complete -c setfacl -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_user' -a '(__fish_facl_extract_acl)(__fish_complete_users  | string replace -a "\t" ":\t")'
+complete -c setfacl -s m -s x -l modify -l remove -l set -n '__fish_facl_starts_with_spec_group' -a '(__fish_facl_extract_acl)(__fish_complete_groups | string replace -a "\t" ":\t")'
 complete -c setfacl -f -s m -s x -l modify -l remove -l set -a '(__fish_facl_list_spec_keyword)'
 
-complete -c setfacl    -s b -l remove-all     -d 'Remove all extended ACL entries'
-complete -c setfacl    -s k -l remove-default -d 'Remove the Default ACL'
-complete -c setfacl    -s n -l no-mask        -d 'Do not recalculate the effective rights mask'
-complete -c setfacl         -l mask           -d 'Do recalculate the effective rights mask'
-complete -c setfacl    -s d -l default        -d 'All operations apply to the Default ACL'
-complete -c setfacl         -l restore        -d 'Restore a permission backup created by `getfacl -R\' or similar'
-complete -c setfacl         -l test           -d 'Test mode'
-complete -c setfacl    -s R -l recursive      -d 'Apply operations to all files and directories recursively'
-complete -c setfacl    -s L -l logical        -d 'Logical walk, follow symbolic links to directories'
-complete -c setfacl    -s P -l physical       -d 'Physical walk, do not follow symbolic links to directories'
-complete -c setfacl -f -s v -l version        -d 'Print the version of setfacl and exit'
-complete -c setfacl -f -s h -l help           -d 'Print help explaining the command line options'
-complete -c setfacl    -s m -l modify         -d 'Modify the current ACL(s) of file(s)'
-complete -c setfacl    -s x -l remove         -d 'Remove entries from the ACL(s) of file(s)'
-complete -c setfacl    -s M -l modify-file    -d 'Read ACL entries to modify from file'
-complete -c setfacl    -s X -l remove-file    -d 'Read ACL entries to remove from file'
-complete -c setfacl         -l set-file       -d 'Read ACL entries to set from file'
-complete -c setfacl         -l set            -d 'Set the ACL of file(s), replacing the current ACL'
+complete -c setfacl -s b -l remove-all -d 'Remove all extended ACL entries'
+complete -c setfacl -s k -l remove-default -d 'Remove the Default ACL'
+complete -c setfacl -s n -l no-mask -d 'Do not recalculate the effective rights mask'
+complete -c setfacl -l mask -d 'Do recalculate the effective rights mask'
+complete -c setfacl -s d -l default -d 'All operations apply to the Default ACL'
+complete -c setfacl -l restore -d 'Restore a permission backup created by `getfacl -R\' or similar'
+complete -c setfacl -l test -d 'Test mode'
+complete -c setfacl -s R -l recursive -d 'Apply operations to all files and directories recursively'
+complete -c setfacl -s L -l logical -d 'Logical walk, follow symbolic links to directories'
+complete -c setfacl -s P -l physical -d 'Physical walk, do not follow symbolic links to directories'
+complete -c setfacl -f -s v -l version -d 'Print the version of setfacl and exit'
+complete -c setfacl -f -s h -l help -d 'Print help explaining the command line options'
+complete -c setfacl -s m -l modify -d 'Modify the current ACL(s) of file(s)'
+complete -c setfacl -s x -l remove -d 'Remove entries from the ACL(s) of file(s)'
+complete -c setfacl -s M -l modify-file -d 'Read ACL entries to modify from file'
+complete -c setfacl -s X -l remove-file -d 'Read ACL entries to remove from file'
+complete -c setfacl -l set-file -d 'Read ACL entries to set from file'
+complete -c setfacl -l set -d 'Set the ACL of file(s), replacing the current ACL'
diff --git a/share/completions/setxkbmap.fish b/share/completions/setxkbmap.fish
index 6a557fb70..0d4592b3d 100644
--- a/share/completions/setxkbmap.fish
+++ b/share/completions/setxkbmap.fish
@@ -2,23 +2,23 @@
 set -l filter '"s/\S+\s\S+\s(.+)\((.+)\)/\1\t\2/;"'
 
 complete -c setxkbmap -o '?' -o help -d 'Print this message'
-complete -c setxkbmap -o compat    -d 'Specifies compatibility map component name' -xa "(sed -r $filter /usr/share/X11/xkb/compat.dir)"
-complete -c setxkbmap -o config    -d 'Specifies configuration file to use' -r
-complete -c setxkbmap -o device    -d 'Specifies the device ID to use' -x
-complete -c setxkbmap -o display   -d 'Specifies display to use' -x
-complete -c setxkbmap -o geometry  -d 'Specifies geometry component name' -xa "(sed -r $filter /usr/share/X11/xkb/geometry.dir)"
-complete -c setxkbmap -o I         -d 'Add <dir> to list of directories to be used' -xa '(__fish_complete_directories)'
-complete -c setxkbmap -o keycodes  -d 'Specifies keycodes component name' -xa "(sed -r $filter /usr/share/X11/xkb/keycodes.dir)"
-complete -c setxkbmap -o keymap    -d 'Specifies name of keymap to load' -xa "(sed -r $filter /usr/share/X11/xkb/keymap.dir)"
-complete -c setxkbmap -o layout    -d 'Specifies layout used to choose component names' -xa "(__fish_complete_setxkbmap layout)"
-complete -c setxkbmap -o model     -d 'Specifies model used to choose component names' -xa "(__fish_complete_setxkbmap model)"
-complete -c setxkbmap -o option    -d 'Adds an option used to choose component names' -xa "(__fish_complete_list , '__fish_complete_setxkbmap option')"
-complete -c setxkbmap -o print     -d 'Print a complete xkb_keymap description and exit'
-complete -c setxkbmap -o query     -d 'Print the current layout settings and exit'
-complete -c setxkbmap -o rules     -d 'Name of rules file to use' -x
-complete -c setxkbmap -o symbols   -d 'Specifies symbols component name' -xa "(sed -r $filter /usr/share/X11/xkb/symbols.dir)"
-complete -c setxkbmap -o synch     -d 'Synchronize request w/X server'
-complete -c setxkbmap -o types     -d 'Specifies types component name' -xa "(sed -r $filter /usr/share/X11/xkb/types.dir)"
+complete -c setxkbmap -o compat -d 'Specifies compatibility map component name' -xa "(sed -r $filter /usr/share/X11/xkb/compat.dir)"
+complete -c setxkbmap -o config -d 'Specifies configuration file to use' -r
+complete -c setxkbmap -o device -d 'Specifies the device ID to use' -x
+complete -c setxkbmap -o display -d 'Specifies display to use' -x
+complete -c setxkbmap -o geometry -d 'Specifies geometry component name' -xa "(sed -r $filter /usr/share/X11/xkb/geometry.dir)"
+complete -c setxkbmap -o I -d 'Add <dir> to list of directories to be used' -xa '(__fish_complete_directories)'
+complete -c setxkbmap -o keycodes -d 'Specifies keycodes component name' -xa "(sed -r $filter /usr/share/X11/xkb/keycodes.dir)"
+complete -c setxkbmap -o keymap -d 'Specifies name of keymap to load' -xa "(sed -r $filter /usr/share/X11/xkb/keymap.dir)"
+complete -c setxkbmap -o layout -d 'Specifies layout used to choose component names' -xa "(__fish_complete_setxkbmap layout)"
+complete -c setxkbmap -o model -d 'Specifies model used to choose component names' -xa "(__fish_complete_setxkbmap model)"
+complete -c setxkbmap -o option -d 'Adds an option used to choose component names' -xa "(__fish_complete_list , '__fish_complete_setxkbmap option')"
+complete -c setxkbmap -o print -d 'Print a complete xkb_keymap description and exit'
+complete -c setxkbmap -o query -d 'Print the current layout settings and exit'
+complete -c setxkbmap -o rules -d 'Name of rules file to use' -x
+complete -c setxkbmap -o symbols -d 'Specifies symbols component name' -xa "(sed -r $filter /usr/share/X11/xkb/symbols.dir)"
+complete -c setxkbmap -o synch -d 'Synchronize request w/X server'
+complete -c setxkbmap -o types -d 'Specifies types component name' -xa "(sed -r $filter /usr/share/X11/xkb/types.dir)"
 complete -c setxkbmap -o v -o verbose -d 'Sets verbosity (1..10).  Higher values yield more messages' -xa '(seq 1 10)'
-complete -c setxkbmap -o variant   -d 'Specifies layout variant used to choose component names' -xa "(__fish_complete_setxkbmap variant)"
+complete -c setxkbmap -o variant -d 'Specifies layout variant used to choose component names' -xa "(__fish_complete_setxkbmap variant)"
 
diff --git a/share/completions/snap.fish b/share/completions/snap.fish
index a62f9c2ba..9923a5c52 100644
--- a/share/completions/snap.fish
+++ b/share/completions/snap.fish
@@ -1,14 +1,14 @@
 # Completions for `snap` command
 
 function __fish_snap_no_subcommand -d 'Test if snap has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i abort ack alias aliases buy changes connect disable disconnect download\
-            enable find get help info install interfaces known list login logout prefer refresh remove\
-            revert run set tasks try unalias version watch
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i abort ack alias aliases buy changes connect disable disconnect download\
+ enable find get help info install interfaces known list login logout prefer refresh remove\
+ revert run set tasks try unalias version watch
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_snap_using_subcommand -d 'Test if given subcommand is used'
@@ -21,30 +21,32 @@ function __fish_snap_using_subcommand -d 'Test if given subcommand is used'
 end
 
 function __fish_snap_use_package -d 'Test if snap command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i alias buy disable download enable info install refresh remove revert run try
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i alias buy disable download enable info install refresh remove revert run try
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_snap_use_file -d 'Test if snap command should have files as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i ack try
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i ack try
+            return 0
+        end
+    end
+    return 1
 end
 
 function __fish_snap_subcommand
-    set subcommand $argv[1]; set -e argv[1]
+    set subcommand $argv[1]
+    set -e argv[1]
     complete -f -c snap -n '__fish_snap_no_subcommand' -a $subcommand $argv
 end
 
 function __fish_snap_option
-    set subcommand $argv[1]; set -e argv[1]
+    set subcommand $argv[1]
+    set -e argv[1]
     complete -f -c snap -n "__fish_snap_using_subcommand $subcommand" $argv
 end
 
@@ -78,13 +80,13 @@ function __fish_snap_aliases -d 'List aliases'
 end
 
 function __fish_snap_no_assertion -d 'Check that no assertion type is used yet'
-	for i in (commandline -opc)
-		if contains -- $i account account-key model serial snap-declaration snap-build snap-revision\
-            system-user validation
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i account account-key model serial snap-declaration snap-build snap-revision\
+ system-user validation
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_snap_using_assertion -d 'Check if certain assertion type is used'
@@ -97,10 +99,11 @@ function __fish_snap_using_assertion -d 'Check if certain assertion type is used
 end
 
 function __fish_snap_assertion
-    set assertion $argv[1]; set -e argv[1]
+    set assertion $argv[1]
+    set -e argv[1]
     complete -f -c snap -n '__fish_snap_using_subcommand known; and __fish_snap_no_assertion' -a $assertion
     complete -f -c snap -n "__fish_snap_using_assertion $assertion" -a "(__fish_snap_filters $assertion)"\
-        -d "Filter"
+ -d "Filter"
 end
 
 function __fish_snap_filters -d 'List assertion filters'
@@ -114,173 +117,173 @@ end
 complete -c snap -n '__fish_snap_use_file' -a '(__fish_complete_path)'
 
 # Support flags
-complete -x -f -c snap -s h -l help     -d 'Show this help message'
-complete -x -f -c snap -s v -l version  -d 'Print the version and exit'
+complete -x -f -c snap -s h -l help -d 'Show this help message'
+complete -x -f -c snap -s v -l version -d 'Print the version and exit'
 
 # Abort
-__fish_snap_subcommand abort                    -d "Abort a pending change"
+__fish_snap_subcommand abort -d "Abort a pending change"
 
 # Ack
-__fish_snap_subcommand ack -r                   -d "Adds an assertion to the system"
+__fish_snap_subcommand ack -r -d "Adds an assertion to the system"
 
 # Alias
-__fish_snap_subcommand alias -r                 -d "Sets up a manual alias"
+__fish_snap_subcommand alias -r -d "Sets up a manual alias"
 __fish_snap_option alias -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Aliases
-__fish_snap_subcommand aliases                  -d "Lists aliases in the system"
+__fish_snap_subcommand aliases -d "Lists aliases in the system"
 
 # Buy
-__fish_snap_subcommand buy -r                   -d "Buys a snap"
+__fish_snap_subcommand buy -r -d "Buys a snap"
 
 # Changes
-__fish_snap_subcommand changes                  -d "List system changes"
+__fish_snap_subcommand changes -d "List system changes"
 
 # Connect
-__fish_snap_subcommand connect -r               -d "Connects a plug to a slot"
+__fish_snap_subcommand connect -r -d "Connects a plug to a slot"
 __fish_snap_option connect -a '(__fish_snap_interfaces)' -d "Snap:Plug or Slot"
 
 # Disable
-__fish_snap_subcommand disable -r               -d "Disables a snap in the system"
+__fish_snap_subcommand disable -r -d "Disables a snap in the system"
 __fish_snap_option disable -a '(__fish_snap_enabled_snaps)' -d "Enabled snap"
 
 # Disconnect
-__fish_snap_subcommand disconnect -r            -d "Disconnects a plug from a slot"
+__fish_snap_subcommand disconnect -r -d "Disconnects a plug from a slot"
 __fish_snap_option disconnect -a '(__fish_snap_interfaces)' -d "Snap:Plug or Slot"
 
 # Downloads
-__fish_snap_subcommand download -r              -d "Downloads the given snap"
-__fish_snap_option download -l channel          -d "Use this channel instead of stable"
-__fish_snap_option download -l edge             -d "Install from the edge channel"
-__fish_snap_option download -l beta             -d "Install from the beta channel"
-__fish_snap_option download -l candidate        -d "Install from the candidate channel"
-__fish_snap_option download -l stable           -d "Install from the stable channel"
-__fish_snap_option download -l revision         -d "Download the given revision of snap, to which you must have developer access"
+__fish_snap_subcommand download -r -d "Downloads the given snap"
+__fish_snap_option download -l channel -d "Use this channel instead of stable"
+__fish_snap_option download -l edge -d "Install from the edge channel"
+__fish_snap_option download -l beta -d "Install from the beta channel"
+__fish_snap_option download -l candidate -d "Install from the candidate channel"
+__fish_snap_option download -l stable -d "Install from the stable channel"
+__fish_snap_option download -l revision -d "Download the given revision of snap, to which you must have developer access"
 
 # Enable
-__fish_snap_subcommand enable -r                -d "Enables a snap in the system"
+__fish_snap_subcommand enable -r -d "Enables a snap in the system"
 __fish_snap_option enable -a '(__fish_snap_disabled_snaps)' -d "Disabled snap"
 
 # Find
-__fish_snap_subcommand find -r                  -d "Finds packages to install"
-__fish_snap_option find -l private              -d "Search private snaps"
-__fish_snap_option find -l section              -d "Restrict the search to a given section"
+__fish_snap_subcommand find -r -d "Finds packages to install"
+__fish_snap_option find -l private -d "Search private snaps"
+__fish_snap_option find -l section -d "Restrict the search to a given section"
 
 # There seems to be no programmatic way of getting configuration options
 # Get
-__fish_snap_subcommand get -r                   -d "Prints configuration options"
-__fish_snap_option get -s t                     -d "Strict typing with nulls and quoted strings"
-__fish_snap_option get -s d                     -d "Always return documents, even with single key"
+__fish_snap_subcommand get -r -d "Prints configuration options"
+__fish_snap_option get -s t -d "Strict typing with nulls and quoted strings"
+__fish_snap_option get -s d -d "Always return documents, even with single key"
 __fish_snap_option get -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Help
-__fish_snap_subcommand help                     -d "The help command shows useful information"
-__fish_snap_option help -l man                  -d "Generates the manpage"
+__fish_snap_subcommand help -d "The help command shows useful information"
+__fish_snap_option help -l man -d "Generates the manpage"
 
 # Info
-__fish_snap_subcommand info -r                  -d "Show detailed information about a snap"
-__fish_snap_option info -l verbose              -d "Include a verbose list of snap's notes"
+__fish_snap_subcommand info -r -d "Show detailed information about a snap"
+__fish_snap_option info -l verbose -d "Include a verbose list of snap's notes"
 __fish_snap_option info -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Install
-__fish_snap_subcommand install -r               -d "Installs a snap to the system"
-__fish_snap_option install -l channel           -d "Use this channel instead of stable"
-__fish_snap_option install -l edge              -d "Install from the edge channel"
-__fish_snap_option install -l beta              -d "Install from the beta channel"
-__fish_snap_option install -l candidate         -d "Install from the candidate channel"
-__fish_snap_option install -l stable            -d "Install from the stable channel"
-__fish_snap_option install -l revision          -d "Install the given revision of snap, to which you must have developer access"
-__fish_snap_option install -l devmode           -d "Put snap in development mode and disable security confinement"
-__fish_snap_option install -l jailmode          -d "Put snap in enforced confinement mode"
-__fish_snap_option install -l classic           -d "Put snap in classic mode and disable security confinement"
-__fish_snap_option install -l dangerous         -d "Install the given snap file even if there are no pre-acknowledged signatures for it, meaning it was not  verified and could be dangerous"
+__fish_snap_subcommand install -r -d "Installs a snap to the system"
+__fish_snap_option install -l channel -d "Use this channel instead of stable"
+__fish_snap_option install -l edge -d "Install from the edge channel"
+__fish_snap_option install -l beta -d "Install from the beta channel"
+__fish_snap_option install -l candidate -d "Install from the candidate channel"
+__fish_snap_option install -l stable -d "Install from the stable channel"
+__fish_snap_option install -l revision -d "Install the given revision of snap, to which you must have developer access"
+__fish_snap_option install -l devmode -d "Put snap in development mode and disable security confinement"
+__fish_snap_option install -l jailmode -d "Put snap in enforced confinement mode"
+__fish_snap_option install -l classic -d "Put snap in classic mode and disable security confinement"
+__fish_snap_option install -l dangerous -d "Install the given snap file even if there are no pre-acknowledged signatures for it, meaning it was not  verified and could be dangerous"
 
 # Interfaces
-__fish_snap_subcommand interfaces               -d "Lists interfaces in the system"
+__fish_snap_subcommand interfaces -d "Lists interfaces in the system"
 complete -f -c snap -n '__fish_snap_using_subcommand interfaces' -a '(__fish_snap_installed_snaps)' -d "Snap"
-__fish_snap_option interfaces -s i              -d "Constrain listing to specific interfaces"
+__fish_snap_option interfaces -s i -d "Constrain listing to specific interfaces"
 
 # Known
-__fish_snap_subcommand known -r                 -d "Shows known assertions of the provided type"
-__fish_snap_option known -l remote              -d "Shows known assertions of the provided type"
-__fish_snap_assertion account                   -d 'Assertion type'
-__fish_snap_assertion account-key               -d 'Assertion type'
-__fish_snap_assertion model                     -d 'Assertion type'
-__fish_snap_assertion serial                    -d 'Assertion type'
-__fish_snap_assertion snap-declaration          -d 'Assertion type'
-__fish_snap_assertion snap-build                -d 'Assertion type'
-__fish_snap_assertion snap-revision             -d 'Assertion type'
-__fish_snap_assertion system-user               -d 'Assertion type'
-__fish_snap_assertion validation                -d 'Assertion type'
+__fish_snap_subcommand known -r -d "Shows known assertions of the provided type"
+__fish_snap_option known -l remote -d "Shows known assertions of the provided type"
+__fish_snap_assertion account -d 'Assertion type'
+__fish_snap_assertion account-key -d 'Assertion type'
+__fish_snap_assertion model -d 'Assertion type'
+__fish_snap_assertion serial -d 'Assertion type'
+__fish_snap_assertion snap-declaration -d 'Assertion type'
+__fish_snap_assertion snap-build -d 'Assertion type'
+__fish_snap_assertion snap-revision -d 'Assertion type'
+__fish_snap_assertion system-user -d 'Assertion type'
+__fish_snap_assertion validation -d 'Assertion type'
 
 # List
-__fish_snap_subcommand list                     -d "List installed snaps"
-__fish_snap_option list -l all                  -d "Show all revisions"
+__fish_snap_subcommand list -d "List installed snaps"
+__fish_snap_option list -l all -d "Show all revisions"
 
 # Login
-__fish_snap_subcommand login                    -d "Authenticates on snapd and the store"
+__fish_snap_subcommand login -d "Authenticates on snapd and the store"
 
 # Logout
-__fish_snap_subcommand logout                   -d "Log out of the store"
+__fish_snap_subcommand logout -d "Log out of the store"
 
 # Prefer
-__fish_snap_subcommand prefer -r                -d "Prefes aliases from a snap and disable conflicts"
+__fish_snap_subcommand prefer -r -d "Prefes aliases from a snap and disable conflicts"
 __fish_snap_option prefer -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Refresh
-__fish_snap_subcommand refresh -r               -d "Refreshes a snap in the system"
-__fish_snap_option refresh -l channel           -d "Use this channel instead of stable"
-__fish_snap_option refresh -l edge              -d "Install from the edge channel"
-__fish_snap_option refresh -l beta              -d "Install from the beta channel"
-__fish_snap_option refresh -l candidate         -d "Install from the candidate channel"
-__fish_snap_option refresh -l stable            -d "Install from the stable channel"
-__fish_snap_option refresh -l revision          -d "Refresh to the given revision"
-__fish_snap_option refresh -l devmode           -d "Put snap in development mode and disable security confinement"
-__fish_snap_option refresh -l jailmode          -d "Put snap in enforced confinement mode"
-__fish_snap_option refresh -l classic           -d "Put snap in classic mode and disable security confinement"
-__fish_snap_option refresh -l ignore-validation     -d "Ignore validation by other snaps blocking the refresh"
+__fish_snap_subcommand refresh -r -d "Refreshes a snap in the system"
+__fish_snap_option refresh -l channel -d "Use this channel instead of stable"
+__fish_snap_option refresh -l edge -d "Install from the edge channel"
+__fish_snap_option refresh -l beta -d "Install from the beta channel"
+__fish_snap_option refresh -l candidate -d "Install from the candidate channel"
+__fish_snap_option refresh -l stable -d "Install from the stable channel"
+__fish_snap_option refresh -l revision -d "Refresh to the given revision"
+__fish_snap_option refresh -l devmode -d "Put snap in development mode and disable security confinement"
+__fish_snap_option refresh -l jailmode -d "Put snap in enforced confinement mode"
+__fish_snap_option refresh -l classic -d "Put snap in classic mode and disable security confinement"
+__fish_snap_option refresh -l ignore-validation -d "Ignore validation by other snaps blocking the refresh"
 __fish_snap_option refresh -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Remove
-__fish_snap_subcommand remove -r                -d "Removes a snap from the system"
-__fish_snap_option remove -l revision           -d "Removes only the given revision"
+__fish_snap_subcommand remove -r -d "Removes a snap from the system"
+__fish_snap_option remove -l revision -d "Removes only the given revision"
 __fish_snap_option remove -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Revert
-__fish_snap_subcommand revert -r                -d "Revert the given snap to the previous state"
-__fish_snap_option refresh -l revision          -d "Revert to the given revision"
-__fish_snap_option refresh -l devmode           -d "Put snap in development mode and disable security confinement"
-__fish_snap_option refresh -l jailmode          -d "Put snap in enforced confinement mode"
-__fish_snap_option refresh -l classic           -d "Put snap in classic mode and disable security confinement"
+__fish_snap_subcommand revert -r -d "Revert the given snap to the previous state"
+__fish_snap_option refresh -l revision -d "Revert to the given revision"
+__fish_snap_option refresh -l devmode -d "Put snap in development mode and disable security confinement"
+__fish_snap_option refresh -l jailmode -d "Put snap in enforced confinement mode"
+__fish_snap_option refresh -l classic -d "Put snap in classic mode and disable security confinement"
 __fish_snap_option revert -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Run
-__fish_snap_subcommand run -r                   -d "Run the given snap command"
-__fish_snap_option run -l shell                 -d "Run a shell instead of the command (useful for debugging)"
+__fish_snap_subcommand run -r -d "Run the given snap command"
+__fish_snap_option run -l shell -d "Run a shell instead of the command (useful for debugging)"
 __fish_snap_option run -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # There seems to be no programmatic way of getting configuration options
 # Set
-__fish_snap_subcommand set -r                   -d "Changes configuration options"
+__fish_snap_subcommand set -r -d "Changes configuration options"
 __fish_snap_option set -a '(__fish_snap_installed_snaps)' -d "Snap"
 
 # Tasks
-__fish_snap_subcommand tasks                    -d "List a change's tasks"
+__fish_snap_subcommand tasks -d "List a change's tasks"
 __fish_snap_option tasks -a '(__fish_snap_change_id)' -d "ID"
 
 # Try
-__fish_snap_subcommand try -r                   -d "Tests a snap in the system"
-__fish_snap_option try -l devmode               -d "Put snap in development mode and disable security confinement"
-__fish_snap_option try -l jailmode              -d "Put snap in enforced confinement mode"
-__fish_snap_option try -l classic               -d "Put snap in classic mode and disable security confinement"
+__fish_snap_subcommand try -r -d "Tests a snap in the system"
+__fish_snap_option try -l devmode -d "Put snap in development mode and disable security confinement"
+__fish_snap_option try -l jailmode -d "Put snap in enforced confinement mode"
+__fish_snap_option try -l classic -d "Put snap in classic mode and disable security confinement"
 
 # Unalias
-__fish_snap_subcommand unalias -r               -d "Unalias a manual alias or an entire snap"
+__fish_snap_subcommand unalias -r -d "Unalias a manual alias or an entire snap"
 __fish_snap_option unalias -a '(__fish_snap_aliases)' -d "Alias or snap"
 
 # Version
-__fish_snap_subcommand version                  -d "Shows version details"
+__fish_snap_subcommand version -d "Shows version details"
 
 # Watch
-__fish_snap_subcommand watch                    -d "Watch a change in progress"
+__fish_snap_subcommand watch -d "Watch a change in progress"
 __fish_snap_option watch -a '(__fish_snap_change_id)' -d "ID"
diff --git a/share/completions/sort.fish b/share/completions/sort.fish
index cb42ae1c4..967627703 100644
--- a/share/completions/sort.fish
+++ b/share/completions/sort.fish
@@ -8,7 +8,7 @@ complete -c sort -s h -l human-numeric-sort -d "Compare human readable numbers [
 complete -c sort -s M -l month-sort -d "Compare month names"
 complete -c sort -s n -l numeric-sort -d "Compare string numerical value"
 complete -c sort -s R -l random-sort -d "Sort by random hash of keys"
-complete -c sort      -l random-source -d "Get random bytes from FILE"
+complete -c sort -l random-source -d "Get random bytes from FILE"
 complete -c sort -s r -l reverse -d "Reverse results"
 complete -c sort -s c -l check -d "Only check if sorted"
 complete -c sort -s k -l key -d "Define key"
diff --git a/share/completions/ssh.fish b/share/completions/ssh.fish
index ef13b2f1a..f2becec78 100644
--- a/share/completions/ssh.fish
+++ b/share/completions/ssh.fish
@@ -45,11 +45,11 @@ complete -c ssh -s c -d "Encryption cipher" -xa "(ssh -Q cipher)"
 
 # Also look up hosts from the history
 function __ssh_history_completions --argument limit
-	if string match -q ""
-		set limit 100
-	end
+    if string match -q ""
+        set limit 100
+    end
 
-	history --prefix ssh | sed -n "s/.* \([A-Za-z0-9._:-]\+@[A-Za-z0-9._:-]\+\).*/\1/p" | head -n $limit
+    history --prefix ssh | sed -n "s/.* \([A-Za-z0-9._:-]\+@[A-Za-z0-9._:-]\+\).*/\1/p" | head -n $limit
 end
 
 complete -k -c ssh -a '(__ssh_history_completions 100)' -f -d "Remote"
diff --git a/share/completions/stat.fish b/share/completions/stat.fish
index 9a540feb1..804e72032 100644
--- a/share/completions/stat.fish
+++ b/share/completions/stat.fish
@@ -1,20 +1,20 @@
-if stat --version 2>/dev/null > /dev/null # GNU
-	complete -c stat -s L -l dereference     -d 'follow links'
-	complete -c stat -s f -l file-system     -d 'display file system status instead of file status'
-	complete -c stat -s c -l format -x       -d 'use the specified FORMAT instead of the default; output a newline after each use of FORMAT'
-	complete -c stat -l printf -x            -d 'like --format, but interpret backslash escapes, and do not output a mandatory trailing newline.  If you want a newline, include \n in FORMAT'
-	complete -c stat -s t -l terse           -d 'print the information in terse form'
-	complete -c stat -l help     -d 'display this help and exit'
-	complete -c stat -l version  -d 'output version information and exit'
+if stat --version 2>/dev/null >/dev/null # GNU
+    complete -c stat -s L -l dereference -d 'follow links'
+    complete -c stat -s f -l file-system -d 'display file system status instead of file status'
+    complete -c stat -s c -l format -x -d 'use the specified FORMAT instead of the default; output a newline after each use of FORMAT'
+    complete -c stat -l printf -x -d 'like --format, but interpret backslash escapes, and do not output a mandatory trailing newline.  If you want a newline, include \n in FORMAT'
+    complete -c stat -s t -l terse -d 'print the information in terse form'
+    complete -c stat -l help -d 'display this help and exit'
+    complete -c stat -l version -d 'output version information and exit'
 else # OS X
-	complete -c stat -s F -d "Display content type symbols similar to ls(1)"
-	complete -c stat -s f -d "Display information using specified FORMAT" -r
-	complete -c stat -s L -d "Use stat(2) instead of lsstat(2)"
-	complete -c stat -s l -d "Display output in ls -lT format"
-	complete -c stat -s n -d "Don't force a newline to appear at end of each piece of output"
-	complete -c stat -s q -d "Supress failure messages"
-	complete -c stat -s r -d "Display raw information"
-	complete -c stat -s s -d "Display informationin ``shell output'' suitable for initialising variables"
-	complete -c stat -s t -d "Display timestamps using specified FORMAT" -r
-	complete -c stat -s x -d "Verbose information, similar to some Linux distributions"
+    complete -c stat -s F -d "Display content type symbols similar to ls(1)"
+    complete -c stat -s f -d "Display information using specified FORMAT" -r
+    complete -c stat -s L -d "Use stat(2) instead of lsstat(2)"
+    complete -c stat -s l -d "Display output in ls -lT format"
+    complete -c stat -s n -d "Don't force a newline to appear at end of each piece of output"
+    complete -c stat -s q -d "Supress failure messages"
+    complete -c stat -s r -d "Display raw information"
+    complete -c stat -s s -d "Display informationin ``shell output'' suitable for initialising variables"
+    complete -c stat -s t -d "Display timestamps using specified FORMAT" -r
+    complete -c stat -s x -d "Verbose information, similar to some Linux distributions"
 end
\ No newline at end of file
diff --git a/share/completions/stream.fish b/share/completions/stream.fish
index 778f4c0fe..b50979943 100644
--- a/share/completions/stream.fish
+++ b/share/completions/stream.fish
@@ -1,33 +1,33 @@
-complete -c stream -o authenticate                  -d 'Decipher image with this password [password]'
-complete -c stream -o channel                       -d 'Apply option to select image channels [type]' -xa '(stream -list channel)'
-complete -c stream -o colorspace                    -d 'Alternate image colorspace [type]' -xa '(stream -list colorspace)'
-complete -c stream -o compress                      -d 'Type of pixel compression when writing the image [type]' -xa '(stream -list compress)'
-complete -c stream -o define                        -d 'Define one or more image format options [format:option]'
-complete -c stream -o density                       -d 'Horizontal and vertical density of the image [geometry]'
-complete -c stream -o depth                         -d 'Image depth [value]'
-complete -c stream -o extract                       -d 'Extract area from image [geometry]'
-complete -c stream -o identify                      -d 'Identify the format and characteristics of the image'
-complete -c stream -o interlace                     -d 'Type of image interlacing scheme [type]' -xa '(stream -list interlace)'
-complete -c stream -o interpolate                   -d 'Pixel color interpolation method [method]' -xa '(stream -list interpolate)'
-complete -c stream -o limit                         -d 'Pixel cache resource limit [type value]' -x
-complete -c stream -o map                           -d 'Components one or more pixel components'
-complete -c stream -o monitor                       -d 'Monitor progress '
-complete -c stream -o quantize                      -d 'Reduce colors in this colorspace [colorspace]' -xa '(stream -list colorspace)'
-complete -c stream -o quiet                         -d 'Suppress all warning messages'
-complete -c stream -o regard-warnings               -d 'Pay attention to warning messages'
-complete -c stream -o respect-parentheses           -d 'Settings remain in effect until parenthesis boundary'
-complete -c stream -o sampling-factor               -d 'Horizontal and vertical sampling factor [geometry]'
-complete -c stream -o seed                          -d 'Seed a new sequence of pseudo-random numbers [value]'
-complete -c stream -o set                           -d 'Attribute set an image attribute [ value]'
-complete -c stream -o size                          -d 'Width and height of image [geometry]'
-complete -c stream -o storage-type                  -d 'Pixel storage type [type]' -xa '(stream -list storage)'
-complete -c stream -o synchronize                   -d 'Synchronize image to storage device'
-complete -c stream -o taint                         -d 'Declare the image as modified'
-complete -c stream -o transparent-color             -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
-complete -c stream -o verbose                       -d 'Print detailed information about the image'
-complete -c stream -o virtual-pixel                 -d 'Virtual pixel access method [method]' -xa '(stream -list virtual-pixel)'
-complete -c stream -o debug                         -d 'Display copious debugging information [events]' -xa '(stream -list debug)'
-complete -c stream -o help                          -d 'Print program options'
-complete -c stream -o list                          -d 'Print a list of supported option arguments [type]' -xa '(stream -list list)'
-complete -c stream -o log                           -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
-complete -c stream -o version                       -d 'Print version information'
+complete -c stream -o authenticate -d 'Decipher image with this password [password]'
+complete -c stream -o channel -d 'Apply option to select image channels [type]' -xa '(stream -list channel)'
+complete -c stream -o colorspace -d 'Alternate image colorspace [type]' -xa '(stream -list colorspace)'
+complete -c stream -o compress -d 'Type of pixel compression when writing the image [type]' -xa '(stream -list compress)'
+complete -c stream -o define -d 'Define one or more image format options [format:option]'
+complete -c stream -o density -d 'Horizontal and vertical density of the image [geometry]'
+complete -c stream -o depth -d 'Image depth [value]'
+complete -c stream -o extract -d 'Extract area from image [geometry]'
+complete -c stream -o identify -d 'Identify the format and characteristics of the image'
+complete -c stream -o interlace -d 'Type of image interlacing scheme [type]' -xa '(stream -list interlace)'
+complete -c stream -o interpolate -d 'Pixel color interpolation method [method]' -xa '(stream -list interpolate)'
+complete -c stream -o limit -d 'Pixel cache resource limit [type value]' -x
+complete -c stream -o map -d 'Components one or more pixel components'
+complete -c stream -o monitor -d 'Monitor progress '
+complete -c stream -o quantize -d 'Reduce colors in this colorspace [colorspace]' -xa '(stream -list colorspace)'
+complete -c stream -o quiet -d 'Suppress all warning messages'
+complete -c stream -o regard-warnings -d 'Pay attention to warning messages'
+complete -c stream -o respect-parentheses -d 'Settings remain in effect until parenthesis boundary'
+complete -c stream -o sampling-factor -d 'Horizontal and vertical sampling factor [geometry]'
+complete -c stream -o seed -d 'Seed a new sequence of pseudo-random numbers [value]'
+complete -c stream -o set -d 'Attribute set an image attribute [ value]'
+complete -c stream -o size -d 'Width and height of image [geometry]'
+complete -c stream -o storage-type -d 'Pixel storage type [type]' -xa '(stream -list storage)'
+complete -c stream -o synchronize -d 'Synchronize image to storage device'
+complete -c stream -o taint -d 'Declare the image as modified'
+complete -c stream -o transparent-color -d 'Transparent color [color]' -xa '(__fish_complete_convert_options color)'
+complete -c stream -o verbose -d 'Print detailed information about the image'
+complete -c stream -o virtual-pixel -d 'Virtual pixel access method [method]' -xa '(stream -list virtual-pixel)'
+complete -c stream -o debug -d 'Display copious debugging information [events]' -xa '(stream -list debug)'
+complete -c stream -o help -d 'Print program options'
+complete -c stream -o list -d 'Print a list of supported option arguments [type]' -xa '(stream -list list)'
+complete -c stream -o log -d 'Format of debugging information [format]' -xa '(__fish_complete_convert_options format)'
+complete -c stream -o version -d 'Print version information'
diff --git a/share/completions/subl.fish b/share/completions/subl.fish
index e444cbf73..08855c7e8 100644
--- a/share/completions/subl.fish
+++ b/share/completions/subl.fish
@@ -21,12 +21,12 @@
 # Filenames may be given a :line or :line:column suffix to open at a specific
 # location.
 
-complete -c subl                  --long-option project    --require-parameter -d "Load the given project"
-complete -c subl                  --long-option command    --require-parameter -d "Run the given command"
-complete -c subl --short-option n --long-option new-window                     -d "Open a new window"
-complete -c subl --short-option a --long-option add        --require-parameter -d "Add folders to the current window"
-complete -c subl --short-option w --long-option wait                           -d "Wait for the files to be closed before returning"
-complete -c subl --short-option b --long-option background                     -d "Don't activate the application"
-complete -c subl --short-option s --long-option stay                           -d "Keep the application activated after closing the file"
-complete -c subl --short-option h --long-option help       --exclusive         -d "Show help and exit"
-complete -c subl --short-option v --long-option version    --exclusive         -d "Show version and exit"
+complete -c subl --long-option project --require-parameter -d "Load the given project"
+complete -c subl --long-option command --require-parameter -d "Run the given command"
+complete -c subl --short-option n --long-option new-window -d "Open a new window"
+complete -c subl --short-option a --long-option add --require-parameter -d "Add folders to the current window"
+complete -c subl --short-option w --long-option wait -d "Wait for the files to be closed before returning"
+complete -c subl --short-option b --long-option background -d "Don't activate the application"
+complete -c subl --short-option s --long-option stay -d "Keep the application activated after closing the file"
+complete -c subl --short-option h --long-option help --exclusive -d "Show help and exit"
+complete -c subl --short-option v --long-option version --exclusive -d "Show version and exit"
diff --git a/share/completions/sysctl.fish b/share/completions/sysctl.fish
index 5736d93b6..d5cca7390 100644
--- a/share/completions/sysctl.fish
+++ b/share/completions/sysctl.fish
@@ -1,46 +1,46 @@
 if type -q -f sysctl
-	# Only GNU and BSD sysctl seem to know "-h", so others should exit non-zero
-	if sysctl -h >/dev/null 2>/dev/null
-		# Print sysctl keys and values, separated by a tab
-		function __fish_sysctl_values
-			sysctl -a 2>/dev/null | string replace -a " = " \t
-		end
+    # Only GNU and BSD sysctl seem to know "-h", so others should exit non-zero
+    if sysctl -h >/dev/null 2>/dev/null
+        # Print sysctl keys and values, separated by a tab
+        function __fish_sysctl_values
+            sysctl -a 2>/dev/null | string replace -a " = " \t
+        end
 
-		complete -c sysctl -a '(__fish_sysctl_values)' -f
+        complete -c sysctl -a '(__fish_sysctl_values)' -f
 
-		complete -c sysctl -s w -d 'parameter to use.'
-		complete -c sysctl -s n -l values -d 'Only print values'
-		complete -c sysctl -s e -l ignore -d 'Ignore errors about unknown keys'
-		complete -c sysctl -s N -l names -d 'Only print names'
-		complete -c sysctl -s q -l quiet -d 'Be quiet when setting values'
-		complete -c sysctl -l write -d 'Write value'
-		complete -c sysctl -o 'p[FILE]' -l 'load[' -d 'Load in sysctl settings from the file specified or /etc/sysctl'
-		complete -c sysctl -s a -l all -d 'Display all values currently available'
-		complete -c sysctl -l deprecated -d 'Include deprecated parameters too'
-		complete -c sysctl -s b -l binary -d 'Print value without new line'
-		complete -c sysctl -l system -d 'Load settings from all system configuration files'
-		complete -c sysctl -s r -l pattern -d 'Only apply settings that match pattern'
-		# Don't include these as they don't do anything
-		# complete -c sysctl -s A -d 'Alias of -a'
-		# complete -c sysctl -s d -d 'Alias of -h'
-		# complete -c sysctl -s f -d 'Alias of -p'
-		# complete -c sysctl -s X -d 'Alias of -a'
-		# complete -c sysctl -s o -d 'Does nothing, exists for BSD compatibility'
-		# complete -c sysctl -s x -d 'Does nothing, exists for BSD compatibility'
-		complete -c sysctl -s h -l help -d 'Display help text and exit.'
-		complete -c sysctl -s V -l version -d 'Display version information and exit.'
-	else
-		# OSX sysctl
-		function __fish_sysctl_values
-			sysctl -a 2>/dev/null | string replace -a ":" \t
-		end
+        complete -c sysctl -s w -d 'parameter to use.'
+        complete -c sysctl -s n -l values -d 'Only print values'
+        complete -c sysctl -s e -l ignore -d 'Ignore errors about unknown keys'
+        complete -c sysctl -s N -l names -d 'Only print names'
+        complete -c sysctl -s q -l quiet -d 'Be quiet when setting values'
+        complete -c sysctl -l write -d 'Write value'
+        complete -c sysctl -o 'p[FILE]' -l 'load[' -d 'Load in sysctl settings from the file specified or /etc/sysctl'
+        complete -c sysctl -s a -l all -d 'Display all values currently available'
+        complete -c sysctl -l deprecated -d 'Include deprecated parameters too'
+        complete -c sysctl -s b -l binary -d 'Print value without new line'
+        complete -c sysctl -l system -d 'Load settings from all system configuration files'
+        complete -c sysctl -s r -l pattern -d 'Only apply settings that match pattern'
+        # Don't include these as they don't do anything
+        # complete -c sysctl -s A -d 'Alias of -a'
+        # complete -c sysctl -s d -d 'Alias of -h'
+        # complete -c sysctl -s f -d 'Alias of -p'
+        # complete -c sysctl -s X -d 'Alias of -a'
+        # complete -c sysctl -s o -d 'Does nothing, exists for BSD compatibility'
+        # complete -c sysctl -s x -d 'Does nothing, exists for BSD compatibility'
+        complete -c sysctl -s h -l help -d 'Display help text and exit.'
+        complete -c sysctl -s V -l version -d 'Display version information and exit.'
+    else
+        # OSX sysctl
+        function __fish_sysctl_values
+            sysctl -a 2>/dev/null | string replace -a ":" \t
+        end
 
-		complete -c sysctl -a '(__fish_sysctl_values)' -f
-		complete -c sysctl -s a -d 'Display all non-opaque values currently available'
-		complete -c sysctl -s A -d 'Display all MIB variables'
-		complete -c sysctl -s b -d 'Output values in a binary format'
-		complete -c sysctl -s n -d 'Show only values, not names'
-		complete -c sysctl -s w -d 'Set values'
-		complete -c sysctl -s X -d 'Like -A, but prints a hex dump'
-	end
+        complete -c sysctl -a '(__fish_sysctl_values)' -f
+        complete -c sysctl -s a -d 'Display all non-opaque values currently available'
+        complete -c sysctl -s A -d 'Display all MIB variables'
+        complete -c sysctl -s b -d 'Output values in a binary format'
+        complete -c sysctl -s n -d 'Show only values, not names'
+        complete -c sysctl -s w -d 'Set values'
+        complete -c sysctl -s X -d 'Like -A, but prints a hex dump'
+    end
 end
diff --git a/share/completions/systemctl.fish b/share/completions/systemctl.fish
index eeeb58cf0..7cdaebfc9 100644
--- a/share/completions/systemctl.fish
+++ b/share/completions/systemctl.fish
@@ -1,10 +1,10 @@
 set -l systemd_version (systemctl --version | string match "systemd*" | string replace -r "\D*(\d+)\D.*"  '$1')
 set -l commands list-units list-sockets start stop reload restart try-restart reload-or-restart reload-or-try-restart \
-isolate kill is-active is-failed status show get-cgroup-attr set-cgroup-attr unset-cgroup-attr set-cgroup help \
-reset-failed list-unit-files enable disable is-enabled reenable preset mask unmask link load list-jobs cancel dump \
-list-dependencies snapshot delete daemon-reload daemon-reexec show-environment set-environment unset-environment \
-default rescue emergency halt poweroff reboot kexec exit suspend hibernate hybrid-sleep switch-root list-timers \
-set-property
+    isolate kill is-active is-failed status show get-cgroup-attr set-cgroup-attr unset-cgroup-attr set-cgroup help \
+    reset-failed list-unit-files enable disable is-enabled reenable preset mask unmask link load list-jobs cancel dump \
+    list-dependencies snapshot delete daemon-reload daemon-reexec show-environment set-environment unset-environment \
+    default rescue emergency halt poweroff reboot kexec exit suspend hibernate hybrid-sleep switch-root list-timers \
+    set-property
 if test $systemd_version -gt 208 2>/dev/null
     set commands $commands cat
     if test $systemd_version -gt 217 2>/dev/null
diff --git a/share/completions/systemd-analyze.fish b/share/completions/systemd-analyze.fish
index 268f6aa0c..50f04eb02 100644
--- a/share/completions/systemd-analyze.fish
+++ b/share/completions/systemd-analyze.fish
@@ -9,12 +9,12 @@ complete -f -c systemd-analzye -l system -d 'Talk to the service manager of the
 
 set -l commands time blame critical-chain plot dot set-log-level set-log-target dump verify
 
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a time -d  "Print time spent in the kernel" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a blame -d  "Print list of running units ordered by time to init" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a critical-chain -d  "Print a tree of the time critical chain of units" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a plot -d  "Output SVG graphic showing service initialization" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a dot -d  "Output dependency graph in dot(1) format" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a set-log-level -d  "Set logging threshold for manager" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a set-log-target -d  "Set logging target for manager" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a dump -d  "Output state serialization of service manager" -f
-complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a verify -d  "Check unit files for correctness"
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a time -d "Print time spent in the kernel" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a blame -d "Print list of running units ordered by time to init" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a critical-chain -d "Print a tree of the time critical chain of units" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a plot -d "Output SVG graphic showing service initialization" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a dot -d "Output dependency graph in dot(1) format" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a set-log-level -d "Set logging threshold for manager" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a set-log-target -d "Set logging target for manager" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a dump -d "Output state serialization of service manager" -f
+complete -c systemd-analyze -n "not __fish_seen_subcommand_from $commands" -a verify -d "Check unit files for correctness"
diff --git a/share/completions/tail.fish b/share/completions/tail.fish
index b3daaae61..48ea9d9b0 100644
--- a/share/completions/tail.fish
+++ b/share/completions/tail.fish
@@ -1,4 +1,4 @@
-if tail --version > /dev/null 2>/dev/null
+if tail --version >/dev/null 2>/dev/null
     complete -c tail -s c -l bytes -x -d 'output the last K bytes; alternatively, use -c +K to output bytes starting with the Kth of each file'
     complete -c tail -s f -l follow -a 'name descriptor' -d 'output appended data as the file grows; -f -l follow, and --follow=descriptor are equivalent'
     complete -c tail -s F -d 'same as --follow=name --retry'
@@ -18,5 +18,5 @@ else # OSX and similar - no longopts (and fewer shortopts)
     complete -c tail -s F -d 'Like -f, but also follow renamed or rotated files'
     complete -c tail -s n -x -d 'output the last K lines, instead of the last 10 - or only K lines with -r'
     complete -c tail -s q -d 'never output headers giving file names'
-	complete -c tail -s r -d 'Display input in reverse order' # Only in OSX
+    complete -c tail -s r -d 'Display input in reverse order' # Only in OSX
 end
diff --git a/share/completions/tee.fish b/share/completions/tee.fish
index 5224a6d65..af0e88626 100644
--- a/share/completions/tee.fish
+++ b/share/completions/tee.fish
@@ -1,4 +1,4 @@
-complete -c tee -s a -l append              -d 'append to the given FILEs, do not overwrite'
-complete -c tee -s i -l ignore-interrupts   -d 'ignore interrupt signals'
-complete -c tee -l help     -d 'display this help and exit'
-complete -c tee -l version  -d 'output version information and exit'
+complete -c tee -s a -l append -d 'append to the given FILEs, do not overwrite'
+complete -c tee -s i -l ignore-interrupts -d 'ignore interrupt signals'
+complete -c tee -l help -d 'display this help and exit'
+complete -c tee -l version -d 'output version information and exit'
diff --git a/share/completions/tex.fish b/share/completions/tex.fish
index ea70405d5..c6c6b11a4 100644
--- a/share/completions/tex.fish
+++ b/share/completions/tex.fish
@@ -4,14 +4,14 @@ complete -c tex -x -a "(
 __fish_complete_suffix (commandline -ct) .tex '(La)TeX file'
 )"
 
-complete -c tex -o     file-line-error -d "Show errors in style file:line"
-complete -c tex -o  no-file-line-error -d "Show errors not in style file:line"
-complete -c tex -o  halt-on-error      -d "Stop processing at the first error"
-complete -c tex -o  interaction=batchmode   -d "Set interaction mode"
-complete -c tex -o  interaction=nonstopmode -d "Set interaction mode"
-complete -c tex -o  interaction=scrollmode -d "Set interaction mode"
-complete -c tex -o  interaction=errorstopmode -d "Set interaction mode"
-complete -c tex -o  output-directory=  -x -a "(__fish_complete_directories (commandline -ct))" -d "Output directory"
-complete -c tex -o     shell-escape    -d "Enable \write18{SHELL COMMAND}"
-complete -c tex -o  no-shell-escape    -d "Disable \write18{SHELL COMMAND}"
-complete -c tex -o  src-specials       -d "Insert source specials into the DVI file"
+complete -c tex -o file-line-error -d "Show errors in style file:line"
+complete -c tex -o no-file-line-error -d "Show errors not in style file:line"
+complete -c tex -o halt-on-error -d "Stop processing at the first error"
+complete -c tex -o interaction=batchmode -d "Set interaction mode"
+complete -c tex -o interaction=nonstopmode -d "Set interaction mode"
+complete -c tex -o interaction=scrollmode -d "Set interaction mode"
+complete -c tex -o interaction=errorstopmode -d "Set interaction mode"
+complete -c tex -o output-directory= -x -a "(__fish_complete_directories (commandline -ct))" -d "Output directory"
+complete -c tex -o shell-escape -d "Enable \write18{SHELL COMMAND}"
+complete -c tex -o no-shell-escape -d "Disable \write18{SHELL COMMAND}"
+complete -c tex -o src-specials -d "Insert source specials into the DVI file"
diff --git a/share/completions/tmuxinator.fish b/share/completions/tmuxinator.fish
index 4005bf077..cef33a69d 100644
--- a/share/completions/tmuxinator.fish
+++ b/share/completions/tmuxinator.fish
@@ -1,11 +1,11 @@
 function __fish_tmuxinator_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1  ]
-    if [ $argv[1] = $cmd[2]  ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 complete -f -c tmuxinator -a '(tmuxinator completions start)'
diff --git a/share/completions/touch.fish b/share/completions/touch.fish
index 8dc69477e..0e6015083 100644
--- a/share/completions/touch.fish
+++ b/share/completions/touch.fish
@@ -1,22 +1,22 @@
-if touch --version 2>/dev/null > /dev/null # GNU
-	complete -c touch -s a -d "Change access time"
-	complete -c touch -s B -l backward -x -d "Set date back"
-	complete -c touch -s c -l no-create -d "Do not create file"
-	complete -c touch -s d -l date -x -d "Set date"
-	complete -c touch -s f -l forward -x -d "Set date forward"
-	complete -c touch -s m -d "Change modification time"
-	complete -c touch -s r -l reference -d "Use this files times"
-	complete -c touch -s t -d "Set date"
-	complete -c touch -l time -x -d "Set time"
-	complete -c touch -l help -d "Display help and exit"
-	complete -c touch -l version -d "Display version and exit"
+if touch --version 2>/dev/null >/dev/null # GNU
+    complete -c touch -s a -d "Change access time"
+    complete -c touch -s B -l backward -x -d "Set date back"
+    complete -c touch -s c -l no-create -d "Do not create file"
+    complete -c touch -s d -l date -x -d "Set date"
+    complete -c touch -s f -l forward -x -d "Set date forward"
+    complete -c touch -s m -d "Change modification time"
+    complete -c touch -s r -l reference -d "Use this files times"
+    complete -c touch -s t -d "Set date"
+    complete -c touch -l time -x -d "Set time"
+    complete -c touch -l help -d "Display help and exit"
+    complete -c touch -l version -d "Display version and exit"
 else # OS X
-	complete -c touch -s A -d "Adjust access and modification time stamps by specified VALUE" -r
-	complete -c touch -s a -d "Change access time of file"
-	complete -c touch -s c -d "Don't create file if it doesn't exist"
-	complete -c touch -s f -d "Attempt to force the update, even when permission don't permit"
-	complete -c touch -s h -d "Change times of the symlink ranther than the file. Implies `-c'"
-	complete -c touch -s m -d "Change modification time of file"
-	complete -c touch -s r -d "Use access and modifications times from specified file rather than current time of day"
-	complete -c touch -s t -d "Change access and modifications times to specified file rather than current time of day"
+    complete -c touch -s A -d "Adjust access and modification time stamps by specified VALUE" -r
+    complete -c touch -s a -d "Change access time of file"
+    complete -c touch -s c -d "Don't create file if it doesn't exist"
+    complete -c touch -s f -d "Attempt to force the update, even when permission don't permit"
+    complete -c touch -s h -d "Change times of the symlink ranther than the file. Implies `-c'"
+    complete -c touch -s m -d "Change modification time of file"
+    complete -c touch -s r -d "Use access and modifications times from specified file rather than current time of day"
+    complete -c touch -s t -d "Change access and modifications times to specified file rather than current time of day"
 end
\ No newline at end of file
diff --git a/share/completions/tr.fish b/share/completions/tr.fish
index cc450897d..e2c455af5 100644
--- a/share/completions/tr.fish
+++ b/share/completions/tr.fish
@@ -4,49 +4,49 @@
 
 # Test if we are using GNU tr
 if command tr --version >/dev/null 2>/dev/null
-  complete -c tr -x
-  complete -c tr -s c -s C -l complement -d 'use the complement of SET1'
-  complete -c tr -s d -l delete          -d 'delete characters in SET1, do not translate'
-  complete -c tr -s s -l squeeze-repeats -d 'replace each input sequence of a repeated character that is listed in SET1 with a single occurrence of that character'
-  complete -c tr -s t -l truncate-set1   -d 'first truncate SET1 to length of SET2'
-  complete -c tr -l help                 -d 'display this help and exit'
-  complete -c tr -l version              -d 'output version information and exit'
+    complete -c tr -x
+    complete -c tr -s c -s C -l complement -d 'use the complement of SET1'
+    complete -c tr -s d -l delete -d 'delete characters in SET1, do not translate'
+    complete -c tr -s s -l squeeze-repeats -d 'replace each input sequence of a repeated character that is listed in SET1 with a single occurrence of that character'
+    complete -c tr -s t -l truncate-set1 -d 'first truncate SET1 to length of SET2'
+    complete -c tr -l help -d 'display this help and exit'
+    complete -c tr -l version -d 'output version information and exit'
 
-  complete -c tr -a '[:alnum:]'  -d 'all letters and digits'
-  complete -c tr -a '[:alpha:]'  -d 'all letters'
-  complete -c tr -a '[:blank:]'  -d 'all horizontal whitespace'
-  complete -c tr -a '[:cntrl:]'  -d 'all control characters'
-  complete -c tr -a '[:digit:]'  -d 'all digits'
-  complete -c tr -a '[:graph:]'  -d 'all printable characters, not including space'
-  complete -c tr -a '[:lower:]'  -d 'all lower case letters'
-  complete -c tr -a '[:print:]'  -d 'all printable characters, including space'
-  complete -c tr -a '[:punct:]'  -d 'all punctuation characters'
-  complete -c tr -a '[:space:]'  -d 'all horizontal or vertical whitespace'
-  complete -c tr -a '[:upper:]'  -d 'all upper case letters'
-  complete -c tr -a '[:xdigit:]' -d 'all hexadecimal digits'
+    complete -c tr -a '[:alnum:]' -d 'all letters and digits'
+    complete -c tr -a '[:alpha:]' -d 'all letters'
+    complete -c tr -a '[:blank:]' -d 'all horizontal whitespace'
+    complete -c tr -a '[:cntrl:]' -d 'all control characters'
+    complete -c tr -a '[:digit:]' -d 'all digits'
+    complete -c tr -a '[:graph:]' -d 'all printable characters, not including space'
+    complete -c tr -a '[:lower:]' -d 'all lower case letters'
+    complete -c tr -a '[:print:]' -d 'all printable characters, including space'
+    complete -c tr -a '[:punct:]' -d 'all punctuation characters'
+    complete -c tr -a '[:space:]' -d 'all horizontal or vertical whitespace'
+    complete -c tr -a '[:upper:]' -d 'all upper case letters'
+    complete -c tr -a '[:xdigit:]' -d 'all hexadecimal digits'
 else
-  # If not a GNU system, assume we have standard BSD tr features instead
-  complete -c tr -x
-  complete -c tr -s C -d 'Complement the set of characters in string1.'
-  complete -c tr -s c -d 'Same as -C but complement the set of values in string1.'
-  complete -c tr -s d -d 'Delete characters in string1 from the input.'
-  complete -c tr -s s -d 'Squeeze multiple occurrences of the characters listed in the last operand (either string1 or string2) in the input into a single instance of the character.'
-  complete -c tr -l u -d 'Guarantee that any output is unbuffered.'
+    # If not a GNU system, assume we have standard BSD tr features instead
+    complete -c tr -x
+    complete -c tr -s C -d 'Complement the set of characters in string1.'
+    complete -c tr -s c -d 'Same as -C but complement the set of values in string1.'
+    complete -c tr -s d -d 'Delete characters in string1 from the input.'
+    complete -c tr -s s -d 'Squeeze multiple occurrences of the characters listed in the last operand (either string1 or string2) in the input into a single instance of the character.'
+    complete -c tr -l u -d 'Guarantee that any output is unbuffered.'
 
-  complete -c tr -a '[:alnum:]'     -d 'alphanumeric characters'
-  complete -c tr -a '[:alpha:]'     -d 'alphabetic characters'
-  complete -c tr -a '[:blank:]'     -d 'whitespace characters'
-  complete -c tr -a '[:cntrl:]'     -d 'control characters'
-  complete -c tr -a '[:digit:]'     -d 'numeric characters'
-  complete -c tr -a '[:graph:]'     -d 'graphic characters'
-  complete -c tr -a '[:ideogram:]'  -d 'ideographic characters'
-  complete -c tr -a '[:lower:]'     -d 'lower-case alphabetic characters'
-  complete -c tr -a '[:phonogram:]' -d 'phonographic characters'
-  complete -c tr -a '[:print:]'     -d 'printable characters'
-  complete -c tr -a '[:punct:]'     -d 'punctuation characters'
-  complete -c tr -a '[:rune:]'      -d 'valid characters'
-  complete -c tr -a '[:space:]'     -d 'space characters'
-  complete -c tr -a '[:special:]'   -d 'special characters'
-  complete -c tr -a '[:upper:]'     -d 'upper-case characters'
-  complete -c tr -a '[:xdigit:]'    -d 'hexadecimal characters'
+    complete -c tr -a '[:alnum:]' -d 'alphanumeric characters'
+    complete -c tr -a '[:alpha:]' -d 'alphabetic characters'
+    complete -c tr -a '[:blank:]' -d 'whitespace characters'
+    complete -c tr -a '[:cntrl:]' -d 'control characters'
+    complete -c tr -a '[:digit:]' -d 'numeric characters'
+    complete -c tr -a '[:graph:]' -d 'graphic characters'
+    complete -c tr -a '[:ideogram:]' -d 'ideographic characters'
+    complete -c tr -a '[:lower:]' -d 'lower-case alphabetic characters'
+    complete -c tr -a '[:phonogram:]' -d 'phonographic characters'
+    complete -c tr -a '[:print:]' -d 'printable characters'
+    complete -c tr -a '[:punct:]' -d 'punctuation characters'
+    complete -c tr -a '[:rune:]' -d 'valid characters'
+    complete -c tr -a '[:space:]' -d 'space characters'
+    complete -c tr -a '[:special:]' -d 'special characters'
+    complete -c tr -a '[:upper:]' -d 'upper-case characters'
+    complete -c tr -a '[:xdigit:]' -d 'hexadecimal characters'
 end
diff --git a/share/completions/travis.fish b/share/completions/travis.fish
index 2811d8769..8ba924d25 100644
--- a/share/completions/travis.fish
+++ b/share/completions/travis.fish
@@ -1,64 +1,64 @@
 function __fish_travis_needs_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 ]
-    return 0
-  end
-  return 1
+    set cmd (commandline -opc)
+    if [ (count $cmd) -eq 1 ]
+        return 0
+    end
+    return 1
 end
 
 function __fish_travis_using_command
-  set cmd (commandline -opc)
-  if [ (count $cmd) -gt 1 ]
-    if [ $argv[1] = $cmd[2] ]
-      return 0
+    set cmd (commandline -opc)
+    if [ (count $cmd) -gt 1 ]
+        if [ $argv[1] = $cmd[2] ]
+            return 0
+        end
     end
-  end
-  return 1
+    return 1
 end
 
 # Commands
-complete -c travis -f -n '__fish_travis_needs_command' -a 'accounts'        -d "Displays accounts and their subscription status"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'branches'        -d "Displays the most recent build for each branch"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'cache'           -d "Lists or deletes repository caches"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'cancel'          -d "Cancels a job or build"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'console'         -d "Interactive shell"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'disable'         -d "Disables a project"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'enable'          -d "Enables a project"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt'         -d "Encrypts values for the .travis.yml"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt-file'    -d "Encrypts a file and adds decryption steps to .travis.yml"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'endpoint'        -d "Displays or changes the API endpoint"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'env'             -d "Show or modify build environment variables"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'help'            -d "Helps you out when in dire need of information"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'history'         -d "Displays a projects build history"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'init'            -d "Generates a .travis.yml and enables the project"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'lint'            -d "Display warnings for a .travis.yml"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'login'           -d "Authenticates against the API and stores the token"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'logout'          -d "Deletes the stored API token"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'logs'            -d "Streams test logs"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'monitor'         -d "Live monitor for what's going on"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'open'            -d "Opens a build or job in the browser"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'pubkey'          -d "Prints out a repository's public key"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'raw'             -d "Makes an (authenticated) API call and prints out the result"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'report'          -d "Generates a report useful for filing issues"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'repos'           -d "Lists repositories the user has certain permissions on"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'requests'        -d "Lists recent requests"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'restart'         -d "Restarts a build or job"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'settings'        -d "Access repository settings"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'setup'           -d "Sets up an addon or deploy target"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'show'            -d "Displays a build or job"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'sshkey'          -d "Checks, updates or deletes an SSH key"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'status'          -d "Checks status of the latest build"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'sync'            -d "Triggers a new sync with GitHub"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'token'           -d "Outputs the secret API token"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'version'         -d "Outputs the client version"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'whatsup'         -d "Lists most recent builds"
-complete -c travis -f -n '__fish_travis_needs_command' -a 'whoami'          -d "Outputs the current user"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'accounts' -d "Displays accounts and their subscription status"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'branches' -d "Displays the most recent build for each branch"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'cache' -d "Lists or deletes repository caches"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'cancel' -d "Cancels a job or build"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'console' -d "Interactive shell"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'disable' -d "Disables a project"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'enable' -d "Enables a project"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt' -d "Encrypts values for the .travis.yml"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'encrypt-file' -d "Encrypts a file and adds decryption steps to .travis.yml"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'endpoint' -d "Displays or changes the API endpoint"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'env' -d "Show or modify build environment variables"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'help' -d "Helps you out when in dire need of information"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'history' -d "Displays a projects build history"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'init' -d "Generates a .travis.yml and enables the project"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'lint' -d "Display warnings for a .travis.yml"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'login' -d "Authenticates against the API and stores the token"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'logout' -d "Deletes the stored API token"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'logs' -d "Streams test logs"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'monitor' -d "Live monitor for what's going on"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'open' -d "Opens a build or job in the browser"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'pubkey' -d "Prints out a repository's public key"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'raw' -d "Makes an (authenticated) API call and prints out the result"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'report' -d "Generates a report useful for filing issues"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'repos' -d "Lists repositories the user has certain permissions on"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'requests' -d "Lists recent requests"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'restart' -d "Restarts a build or job"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'settings' -d "Access repository settings"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'setup' -d "Sets up an addon or deploy target"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'show' -d "Displays a build or job"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'sshkey' -d "Checks, updates or deletes an SSH key"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'status' -d "Checks status of the latest build"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'sync' -d "Triggers a new sync with GitHub"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'token' -d "Outputs the secret API token"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'version' -d "Outputs the client version"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'whatsup' -d "Lists most recent builds"
+complete -c travis -f -n '__fish_travis_needs_command' -a 'whoami' -d "Outputs the current user"
 
 # General Options
-complete -c travis -f                                      -s h -l help                     -d "Display help"
-complete -c travis -f -n 'not __fish_travis_needs_command' -s i -l interactive              -d "Be interactive and colorful"
-complete -c travis -f -n 'not __fish_travis_needs_command'      -l no-interactive           -d "Don't be interactive and colorful"
-complete -c travis -f -n 'not __fish_travis_needs_command' -s E -l explode                  -d "Don't rescue exceptions"
-complete -c travis -f -n 'not __fish_travis_needs_command'      -l no-explode               -d "Rescue exceptions"
-complete -c travis -f -n 'not __fish_travis_needs_command'      -l skip-version-check       -d "Don't check if travis client is up to date"
-complete -c travis -f -n 'not __fish_travis_needs_command'      -l skip-completion-check    -d "Don't check if auto-completion is set up"
+complete -c travis -f -s h -l help -d "Display help"
+complete -c travis -f -n 'not __fish_travis_needs_command' -s i -l interactive -d "Be interactive and colorful"
+complete -c travis -f -n 'not __fish_travis_needs_command' -l no-interactive -d "Don't be interactive and colorful"
+complete -c travis -f -n 'not __fish_travis_needs_command' -s E -l explode -d "Don't rescue exceptions"
+complete -c travis -f -n 'not __fish_travis_needs_command' -l no-explode -d "Rescue exceptions"
+complete -c travis -f -n 'not __fish_travis_needs_command' -l skip-version-check -d "Don't check if travis client is up to date"
+complete -c travis -f -n 'not __fish_travis_needs_command' -l skip-completion-check -d "Don't check if auto-completion is set up"
diff --git a/share/completions/tree.fish b/share/completions/tree.fish
index b32fb3fc1..d44aaa318 100644
--- a/share/completions/tree.fish
+++ b/share/completions/tree.fish
@@ -1,58 +1,58 @@
 
 
 ## Listing options
-complete -c tree -s a            -d 'All files are listed'
-complete -c tree -s d            -d 'List directories only'
-complete -c tree -s l            -d 'Follow symbolic links like directories'
-complete -c tree -s f            -d 'Print the full path prefix for each file'
-complete -c tree -s x            -d 'Stay on current filesystem only'
-complete -c tree -s L -x         -d 'Descend only level directories deep'
-complete -c tree -s R            -d 'Rerun tree when max dir level reached'
-complete -c tree -s P -r         -d 'List only those files that match the pattern given'
-complete -c tree -s I -r         -d 'Do not list files that match the given pattern'
-complete -c tree -l noreport     -d 'Turn off file/directory count at end of tree listing'
-complete -c tree -l charset -x   -d 'Use charset X for terminal/HTML and indentation line output'
+complete -c tree -s a -d 'All files are listed'
+complete -c tree -s d -d 'List directories only'
+complete -c tree -s l -d 'Follow symbolic links like directories'
+complete -c tree -s f -d 'Print the full path prefix for each file'
+complete -c tree -s x -d 'Stay on current filesystem only'
+complete -c tree -s L -x -d 'Descend only level directories deep'
+complete -c tree -s R -d 'Rerun tree when max dir level reached'
+complete -c tree -s P -r -d 'List only those files that match the pattern given'
+complete -c tree -s I -r -d 'Do not list files that match the given pattern'
+complete -c tree -l noreport -d 'Turn off file/directory count at end of tree listing'
+complete -c tree -l charset -x -d 'Use charset X for terminal/HTML and indentation line output'
 complete -c tree -l filelimit -r -d 'Do not descend dirs with more than # files in them'
-complete -c tree -l timefmt -x   -d 'Print and format time according to the format <f>'
-complete -c tree -s o -r         -d 'Output to file instead of stdout'
+complete -c tree -l timefmt -x -d 'Print and format time according to the format <f>'
+complete -c tree -s o -r -d 'Output to file instead of stdout'
 
 ## File options
-complete -c tree -s q            -d 'Print non-printable characters as \'?\''
-complete -c tree -s N            -d 'Print non-printable characters as is'
-complete -c tree -s Q            -d 'Quote filenames with double quotes'
-complete -c tree -s p            -d 'Print the protections for each file'
-complete -c tree -s u            -d 'Displays file owner or UID number'
-complete -c tree -s g            -d 'Displays file group owner or GID number'
-complete -c tree -s s            -d 'Print the size in bytes of each file'
-complete -c tree -s h            -d 'Print the size in a more human readable way'
-complete -c tree -l si           -d 'Like -h, but use in SI units (powers of 1000)'
-complete -c tree -s D            -d 'Print the date of last modification or (-c) status change'
-complete -c tree -s F            -d 'Appends \'/\', \'=\', \'*\', \'@\', \'|\' or \'>\' as per ls -F'
-complete -c tree -l inodes       -d 'Print inode number of each file'
-complete -c tree -l device       -d 'Print device ID number to which each file belongs'
+complete -c tree -s q -d 'Print non-printable characters as \'?\''
+complete -c tree -s N -d 'Print non-printable characters as is'
+complete -c tree -s Q -d 'Quote filenames with double quotes'
+complete -c tree -s p -d 'Print the protections for each file'
+complete -c tree -s u -d 'Displays file owner or UID number'
+complete -c tree -s g -d 'Displays file group owner or GID number'
+complete -c tree -s s -d 'Print the size in bytes of each file'
+complete -c tree -s h -d 'Print the size in a more human readable way'
+complete -c tree -l si -d 'Like -h, but use in SI units (powers of 1000)'
+complete -c tree -s D -d 'Print the date of last modification or (-c) status change'
+complete -c tree -s F -d 'Appends \'/\', \'=\', \'*\', \'@\', \'|\' or \'>\' as per ls -F'
+complete -c tree -l inodes -d 'Print inode number of each file'
+complete -c tree -l device -d 'Print device ID number to which each file belongs'
 
 
 ## Sorting options
-complete -c tree -s v            -d 'Sort files alphanumerically by version'
-complete -c tree -s r            -d 'Sort files in reverse alphanumeric order'
-complete -c tree -s t            -d 'Sort files by last modification time'
-complete -c tree -s c            -d 'Sort files by last status change time'
-complete -c tree -s U            -d 'Leave files unsorted'
-complete -c tree -l dirsfirst    -d 'List directories before files (-U disables)'
+complete -c tree -s v -d 'Sort files alphanumerically by version'
+complete -c tree -s r -d 'Sort files in reverse alphanumeric order'
+complete -c tree -s t -d 'Sort files by last modification time'
+complete -c tree -s c -d 'Sort files by last status change time'
+complete -c tree -s U -d 'Leave files unsorted'
+complete -c tree -l dirsfirst -d 'List directories before files (-U disables)'
 
 ## Graphics options
-complete -c tree -s i            -d 'Don\'t print indentation lines'
-complete -c tree -s A            -d 'Print ANSI lines graphic indentation lines'
-complete -c tree -s S            -d 'Print with ASCII graphics indentation lines'
-complete -c tree -s n            -d 'Turn colorization off always (-C overrides)'
-complete -c tree -s C            -d 'Turn colorization on always'
+complete -c tree -s i -d 'Don\'t print indentation lines'
+complete -c tree -s A -d 'Print ANSI lines graphic indentation lines'
+complete -c tree -s S -d 'Print with ASCII graphics indentation lines'
+complete -c tree -s n -d 'Turn colorization off always (-C overrides)'
+complete -c tree -s C -d 'Turn colorization on always'
 
 ## XML/HTML options
-complete -c tree -s X            -d 'Prints out an XML representation of the tree'
-complete -c tree -s H -r         -d 'Prints out HTML format with baseHREF as top directory'
-complete -c tree -s T -r         -d 'Replace the default HTML title and H1 header with string'
-complete -c tree -l nolinks      -d 'Turn off hyperlinks in HTML output'
+complete -c tree -s X -d 'Prints out an XML representation of the tree'
+complete -c tree -s H -r -d 'Prints out HTML format with baseHREF as top directory'
+complete -c tree -s T -r -d 'Replace the default HTML title and H1 header with string'
+complete -c tree -l nolinks -d 'Turn off hyperlinks in HTML output'
 
 ## Miscellaneous options
-complete -c tree -l version      -d 'Print version and exit'
-complete -c tree -l help         -d 'Print usage and this help message and exit'
+complete -c tree -l version -d 'Print version and exit'
+complete -c tree -l help -d 'Print usage and this help message and exit'
diff --git a/share/completions/uname.fish b/share/completions/uname.fish
index 10d7acf50..a0b62b0b5 100644
--- a/share/completions/uname.fish
+++ b/share/completions/uname.fish
@@ -1,21 +1,21 @@
 if test (uname) = Darwin
-  complete -c uname -s a -d 'Behave as though all of the options mnrsv were specified.'
-  complete -c uname -s m -d 'print the machine hardware name.'
-  complete -c uname -s n -d 'print the nodename'
-  complete -c uname -s p -d 'print the machine processor architecture name.'
-  complete -c uname -s r -d 'print the operating system release.'
-  complete -c uname -s s -d 'print the operating system name.'
-  complete -c uname -s v -d 'print the operating system version.'
+    complete -c uname -s a -d 'Behave as though all of the options mnrsv were specified.'
+    complete -c uname -s m -d 'print the machine hardware name.'
+    complete -c uname -s n -d 'print the nodename'
+    complete -c uname -s p -d 'print the machine processor architecture name.'
+    complete -c uname -s r -d 'print the operating system release.'
+    complete -c uname -s s -d 'print the operating system name.'
+    complete -c uname -s v -d 'print the operating system version.'
 else
-  complete -c uname -s a -l all -d "Print all information"
-  complete -c uname -s s -l kernel-name -d "Print kernel name"
-  complete -c uname -s n -l nodename -d "Print network node hostname"
-  complete -c uname -s r -l kernel-release -d "Print kernel release"
-  complete -c uname -s v -l kernel-version -d "Print kernel version"
-  complete -c uname -s m -l machine -d "Print machine name"
-  complete -c uname -s p -l processor -d "Print processor"
-  complete -c uname -s i -l hardware-platform -d "Print hardware platform"
-  complete -c uname -s o -l operating-system -d "Print operating system"
-  complete -c uname -l help -d "Display help and exit"
-  complete -c uname -l version -d "Display version and exit"
+    complete -c uname -s a -l all -d "Print all information"
+    complete -c uname -s s -l kernel-name -d "Print kernel name"
+    complete -c uname -s n -l nodename -d "Print network node hostname"
+    complete -c uname -s r -l kernel-release -d "Print kernel release"
+    complete -c uname -s v -l kernel-version -d "Print kernel version"
+    complete -c uname -s m -l machine -d "Print machine name"
+    complete -c uname -s p -l processor -d "Print processor"
+    complete -c uname -s i -l hardware-platform -d "Print hardware platform"
+    complete -c uname -s o -l operating-system -d "Print operating system"
+    complete -c uname -l help -d "Display help and exit"
+    complete -c uname -l version -d "Display version and exit"
 end
diff --git a/share/completions/unexpand.fish b/share/completions/unexpand.fish
index 2b59db4e2..145baaa10 100644
--- a/share/completions/unexpand.fish
+++ b/share/completions/unexpand.fish
@@ -1,6 +1,6 @@
-complete -c unexpand -s a -l all        -d 'convert all blanks, instead of just initial blanks'
-complete -c unexpand -l first-only      -d 'convert only leading sequences of blanks (overrides -a)'
-complete -c unexpand -s t -l tabs -x    -d 'have tabs N characters apart instead of 8 (enables -a)'
-complete -c unexpand -s t -l tabs -x    -d 'use comma separated LIST of tab positions (enables -a)'
-complete -c unexpand -l help     -d 'display this help and exit'
-complete -c unexpand -l version  -d 'output version information and exit'
+complete -c unexpand -s a -l all -d 'convert all blanks, instead of just initial blanks'
+complete -c unexpand -l first-only -d 'convert only leading sequences of blanks (overrides -a)'
+complete -c unexpand -s t -l tabs -x -d 'have tabs N characters apart instead of 8 (enables -a)'
+complete -c unexpand -s t -l tabs -x -d 'use comma separated LIST of tab positions (enables -a)'
+complete -c unexpand -l help -d 'display this help and exit'
+complete -c unexpand -l version -d 'output version information and exit'
diff --git a/share/completions/uniq.fish b/share/completions/uniq.fish
index e02062571..6d966ffb4 100644
--- a/share/completions/uniq.fish
+++ b/share/completions/uniq.fish
@@ -1,23 +1,23 @@
-if uniq --version > /dev/null 2>/dev/null
-	complete -c uniq -s c -l count -d "Print number of occurences"
-	complete -c uniq -s d -l repeated -d "Only print duplicates"
-	complete -c uniq -s D -l all-repeated -d "Remove non-duplicate lines" -f -x -a "
+if uniq --version >/dev/null 2>/dev/null
+    complete -c uniq -s c -l count -d "Print number of occurences"
+    complete -c uniq -s d -l repeated -d "Only print duplicates"
+    complete -c uniq -s D -l all-repeated -d "Remove non-duplicate lines" -f -x -a "
 		none\t'Remove none-duplicate lines'
 		prepend\t'Remove non-duplicate lines and print an empty line before each non-duplicate'
 		separate\t'Remove non-duplicate lines and print an empty line between each non-duplicate'
 	"
-	complete -c uniq -s f -l skip-fields -d "Avoid comparing first N fields" -r
-	complete -c uniq -s i -l ignore-case -d "Case insensitive"
-	complete -c uniq -s s -l skip-chars -d "Avoid comparing first N characters" -r
-	complete -c uniq -s u -l unique -d "Only print unique lines"
-	complete -c uniq -s w -l check-chars -d "Compare only specified number of characters" -r
-	complete -c uniq -l help -d "Display help and exit"
-	complete -c uniq -l version -d "Display version and exit"
+    complete -c uniq -s f -l skip-fields -d "Avoid comparing first N fields" -r
+    complete -c uniq -s i -l ignore-case -d "Case insensitive"
+    complete -c uniq -s s -l skip-chars -d "Avoid comparing first N characters" -r
+    complete -c uniq -s u -l unique -d "Only print unique lines"
+    complete -c uniq -s w -l check-chars -d "Compare only specified number of characters" -r
+    complete -c uniq -l help -d "Display help and exit"
+    complete -c uniq -l version -d "Display version and exit"
 else # BSD
-	complete -c uniq -s c -d 'Precede each output line with count of its occurrence'
-	complete -c uniq -s d -d 'Only print duplicates'
-	complete -c uniq -s f -d 'Avoid comparing first N fields' -x
-	complete -c uniq -s s -d 'Avoid comparing fist N characters' -x
-	complete -c uniq -s u -d 'Only print unique lines'
-	complete -c uniq -s i -d 'Case insensitive comparision'
+    complete -c uniq -s c -d 'Precede each output line with count of its occurrence'
+    complete -c uniq -s d -d 'Only print duplicates'
+    complete -c uniq -s f -d 'Avoid comparing first N fields' -x
+    complete -c uniq -s s -d 'Avoid comparing fist N characters' -x
+    complete -c uniq -s u -d 'Only print unique lines'
+    complete -c uniq -s i -d 'Case insensitive comparision'
 end
diff --git a/share/completions/unzip.fish b/share/completions/unzip.fish
index 1c87aceed..6fed9b7a6 100644
--- a/share/completions/unzip.fish
+++ b/share/completions/unzip.fish
@@ -1,42 +1,42 @@
-complete -c unzip -s p  -d "extract files to pipe, no messages"
-complete -c unzip -s f  -d "freshen existing files, create none"
-complete -c unzip -s u  -d "update files, create if necessary"
-complete -c unzip -s v  -d "list verbosely/show version info"
-complete -c unzip -s x  -d "exclude files that follow (in xlist)"
-complete -c unzip -s l  -d "list files (short format)"
-complete -c unzip -s t  -d "test compressed archive datamodifiers:"
-complete -c unzip -s z  -d "display archive comment only"
-complete -c unzip -s T  -d "timestamp archive to latest"
-complete -c unzip -s d  -d "extract files into dir" -xa '(__fish_complete_directories)'
-complete -c unzip -s n  -d "never overwrite existing files"
-complete -c unzip -s o  -d "overwrite files WITHOUT prompting"
-complete -c unzip -s q  -d "quiet mode"
+complete -c unzip -s p -d "extract files to pipe, no messages"
+complete -c unzip -s f -d "freshen existing files, create none"
+complete -c unzip -s u -d "update files, create if necessary"
+complete -c unzip -s v -d "list verbosely/show version info"
+complete -c unzip -s x -d "exclude files that follow (in xlist)"
+complete -c unzip -s l -d "list files (short format)"
+complete -c unzip -s t -d "test compressed archive datamodifiers:"
+complete -c unzip -s z -d "display archive comment only"
+complete -c unzip -s T -d "timestamp archive to latest"
+complete -c unzip -s d -d "extract files into dir" -xa '(__fish_complete_directories)'
+complete -c unzip -s n -d "never overwrite existing files"
+complete -c unzip -s o -d "overwrite files WITHOUT prompting"
+complete -c unzip -s q -d "quiet mode"
 complete -c unzip -o qq -d "quieter mode"
-complete -c unzip -s a  -d "auto-convert any text files"
-complete -c unzip -s U  -d "use escapes for all non-ASCII Unicode"
+complete -c unzip -s a -d "auto-convert any text files"
+complete -c unzip -s U -d "use escapes for all non-ASCII Unicode"
 complete -c unzip -o UU -d "ignore any Unicode fields"
-complete -c unzip -s j  -d "junk paths (do not make directories)"
+complete -c unzip -s j -d "junk paths (do not make directories)"
 complete -c unzip -s aa -d "treat ALL files as text"
-complete -c unzip -s C  -d "match filenames case-insensitively"
-complete -c unzip -s L  -d "make (some) names lowercase"
-complete -c unzip -s X  -d "restore UID/GID info"
-complete -c unzip -s V  -d "retain VMS version numbers"
-complete -c unzip -s K  -d "keep setuid/setgid/tacky permissions"
-complete -c unzip -s M  -d "pipe through `more` pager"
+complete -c unzip -s C -d "match filenames case-insensitively"
+complete -c unzip -s L -d "make (some) names lowercase"
+complete -c unzip -s X -d "restore UID/GID info"
+complete -c unzip -s V -d "retain VMS version numbers"
+complete -c unzip -s K -d "keep setuid/setgid/tacky permissions"
+complete -c unzip -s M -d "pipe through `more` pager"
 
 # Debian version of unzip
 if unzip -v 2>/dev/null | string match -eq Debian
 
-	# the first non-switch argument should be the zipfile
-	complete -c unzip -n '__fish_is_first_token' -xa '(__fish_complete_suffix .zip)'
+    # the first non-switch argument should be the zipfile
+    complete -c unzip -n '__fish_is_first_token' -xa '(__fish_complete_suffix .zip)'
 
-	# Files thereafter are either files to include or exclude from the operation
-	set -l zipfile
-	complete -c unzip -n 'not __fish_is_first_token' -xa '(unzip -l (eval set zipfile (__fish_first_token); echo $zipfile) | string replace -r --filter ".*:\S+\s+(.*)" "\$1")'
+    # Files thereafter are either files to include or exclude from the operation
+    set -l zipfile
+    complete -c unzip -n 'not __fish_is_first_token' -xa '(unzip -l (eval set zipfile (__fish_first_token); echo $zipfile) | string replace -r --filter ".*:\S+\s+(.*)" "\$1")'
 
 else
 
-	# all tokens should be zip files
-	complete -c unzip -xa '(__fish_complete_suffix .zip)'
+    # all tokens should be zip files
+    complete -c unzip -xa '(__fish_complete_suffix .zip)'
 
 end
diff --git a/share/completions/vagrant.fish b/share/completions/vagrant.fish
index 25b7becbd..fed81c29b 100644
--- a/share/completions/vagrant.fish
+++ b/share/completions/vagrant.fish
@@ -3,12 +3,12 @@
 #
 # Apparently options can only come after commands, with the exception of "-v" and "-h", which are effectively commands.
 set -l commands box cloud connect destroy \
-docker-{exec,logs,run} \
-global-status halt help init list-commands login \
-package plugin provision push rdp reload resume \
-rsync rsync-auto share snapshot ssh ssh-config \
-status suspend up version \
-port powershell winrm{,-config}
+    docker-{exec,logs,run} \
+    global-status halt help init list-commands login \
+    package plugin provision push rdp reload resume \
+    rsync rsync-auto share snapshot ssh ssh-config \
+    status suspend up version \
+    port powershell winrm{,-config}
 
 set -l box_commands add help list outdated prune remove repackage update
 set -l cloud_commands auth box search provider publish version
@@ -48,7 +48,7 @@ function __fish_vagrant_running_machines
     if set -l state (__fish_print_vagrant_state)
         # TODO: stub
         if test -f "$state"
-            string replace -f '"active":' '' < $state | string split ,
+            string replace -f '"active":' '' <$state | string split ,
         else
         end
     end
diff --git a/share/completions/valgrind.fish b/share/completions/valgrind.fish
index 4722f3a01..6e73f254a 100644
--- a/share/completions/valgrind.fish
+++ b/share/completions/valgrind.fish
@@ -2,11 +2,11 @@
 
 set -l skin tool
 if type -q valgrind; and valgrind --version 2>/dev/null | string match -qr -- '-2\.[012]\.'
-	# In older versions of Valgrind, the skin selection option was
+    # In older versions of Valgrind, the skin selection option was
     # '--skin'
-	# But someone decided that it would be fun to change this to
+    # But someone decided that it would be fun to change this to
     # '--tool' for no good reason
-	set skin skin
+    set skin skin
 end
 
 complete -xc valgrind -l $skin -d "Skin" -a "
@@ -18,14 +18,14 @@ complete -xc valgrind -l $skin -d "Skin" -a "
 "
 
 function __fish_valgrind_skin --argument tool -V skin
-	set -l cmd (commandline -cpo)
-	# Quote $cmd so the tokens are separated with a space
-	if string match -qr -- "--$skin(=| )$tool" "$cmd"
-		return 0
+    set -l cmd (commandline -cpo)
+    # Quote $cmd so the tokens are separated with a space
+    if string match -qr -- "--$skin(=| )$tool" "$cmd"
+        return 0
     end
-	# memcheck is the default tool/skin
-	test $tool = memcheck
-	and not string match -- $skin $cmd
+    # memcheck is the default tool/skin
+    test $tool = memcheck
+    and not string match -- $skin $cmd
 end
 
 complete -c valgrind -l help -d "Display help and exit"
diff --git a/share/completions/vi.fish b/share/completions/vi.fish
index 74efc1028..8042b11c0 100644
--- a/share/completions/vi.fish
+++ b/share/completions/vi.fish
@@ -6,7 +6,7 @@
 # Check if vi exists at all ( needed for vi --version )
 if type -q vi
     # Check if vi is really vim
-    if vi --version > /dev/null 2>/dev/null
+    if vi --version >/dev/null 2>/dev/null
         complete -c vi -w vim
     else
         complete -c vi -s s -d 'Suppress all interactive user feedback'
diff --git a/share/completions/vim-addons.fish b/share/completions/vim-addons.fish
index 3460b36e2..8cce2f737 100644
--- a/share/completions/vim-addons.fish
+++ b/share/completions/vim-addons.fish
@@ -5,13 +5,13 @@
 # Adrien Grellier <adrien.grellier@laposte.net>
 #
 
-function __fish_vim-addons_subcommand  -d 'Test if vim-addons has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i list status install remove disable amend files show
-			return 1
-		end
-	end
-	return 0
+function __fish_vim-addons_subcommand -d 'Test if vim-addons has yet to be given the subcommand'
+    for i in (commandline -opc)
+        if contains -- $i list status install remove disable amend files show
+            return 1
+        end
+    end
+    return 0
 end
 
 # Commands
@@ -43,12 +43,12 @@ complete -c vim-addons -n "contains show (commandline -poc)" -a "(vim-addons lis
 
 # Options
 # --------
-complete -c vim-addons -s h -l help         -d "show this usage message and exit"
-complete -c vim-addons -s q -l query        -d "be quiet and make the output more parseable"
+complete -c vim-addons -s h -l help -d "show this usage message and exit"
+complete -c vim-addons -s q -l query -d "be quiet and make the output more parseable"
 complete -c vim-addons -s r -l registry-dir -d "set the registry directory"
-complete -c vim-addons -s s -l source-dir   -d "set the addons source directory"
-complete -c vim-addons -s t -l target-dir   -d "set the addons target directory"
-complete -c vim-addons -s v -l verbose      -d "increase verbosity"
-complete -c vim-addons -s y -l system-dir   -d "set the system-wide target directory"
-complete -c vim-addons -s w -l system-wide  -d "set target directory to the system-wide one"
+complete -c vim-addons -s s -l source-dir -d "set the addons source directory"
+complete -c vim-addons -s t -l target-dir -d "set the addons target directory"
+complete -c vim-addons -s v -l verbose -d "increase verbosity"
+complete -c vim-addons -s y -l system-dir -d "set the system-wide target directory"
+complete -c vim-addons -s w -l system-wide -d "set target directory to the system-wide one"
 
diff --git a/share/completions/wajig.fish b/share/completions/wajig.fish
index 9306c2823..a7865de8e 100644
--- a/share/completions/wajig.fish
+++ b/share/completions/wajig.fish
@@ -1,19 +1,19 @@
 function __fish_wajig_no_subcommand -d 'Test if wajig has yet to be given the subcommand'
-	for i in (commandline -opc)
-		if contains -- $i addcdrom auto-alts auto-clean auto-download auto-install available bug build build-depend changelog clean commands daily-upgrade dependents describe describe-new detail detail-new dist-upgrade docs download file-download file-install file-remove find-file find-pkg fix-configure fix-install fix-missing force help hold init install installr installrs installs integrity large last-update list list-all list-alts list-cache list-commands list-daemons list-files list-hold list-installed list-log list-names list-orphans list-scripts list-section list-section list-status list-wide local-dist-upgrade local-upgrade madison move new news new-upgrades non-free orphans package policy purge purge-depend purge-orphans readme recursive recommended reconfigure reinstall reload remove remove-depend remove-orphans repackage reset restart rpminstall rpmtodeb search search-apt setup show showdistupgrade showinstall showremove showupgrade size sizes snapshot source start status status-match status-search stop suggested tasksel toupgrade unhold unofficial update update-alts update-pci-ids update-usb-ids upgrade versions whatis whichpkg
-			return 1
-		end
-	end
-	return 0
+    for i in (commandline -opc)
+        if contains -- $i addcdrom auto-alts auto-clean auto-download auto-install available bug build build-depend changelog clean commands daily-upgrade dependents describe describe-new detail detail-new dist-upgrade docs download file-download file-install file-remove find-file find-pkg fix-configure fix-install fix-missing force help hold init install installr installrs installs integrity large last-update list list-all list-alts list-cache list-commands list-daemons list-files list-hold list-installed list-log list-names list-orphans list-scripts list-section list-section list-status list-wide local-dist-upgrade local-upgrade madison move new news new-upgrades non-free orphans package policy purge purge-depend purge-orphans readme recursive recommended reconfigure reinstall reload remove remove-depend remove-orphans repackage reset restart rpminstall rpmtodeb search search-apt setup show showdistupgrade showinstall showremove showupgrade size sizes snapshot source start status status-match status-search stop suggested tasksel toupgrade unhold unofficial update update-alts update-pci-ids update-usb-ids upgrade versions whatis whichpkg
+            return 1
+        end
+    end
+    return 0
 end
 
 function __fish_wajig_use_package -d 'Test if wajig command should have packages as potential completion'
-	for i in (commandline -opc)
-		if contains -- $i contains bug build build-depend changelog dependents describe detail hold install installr installrs installs list list-files news package purge purge-depend readme recursive recommended reconfigure reinstall remove remove-depend repackage show showinstall showremove showupgrade size sizes source suggested unhold upgrade versions whatis
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -opc)
+        if contains -- $i contains bug build build-depend changelog dependents describe detail hold install installr installrs installs list list-files news package purge purge-depend readme recursive recommended reconfigure reinstall remove remove-depend repackage show showinstall showremove showupgrade size sizes source suggested unhold upgrade versions whatis
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c wajig -n '__fish_wajig_use_package' -a '(__fish_print_packages)' -d 'Package'h
diff --git a/share/completions/watch.fish b/share/completions/watch.fish
index 58445ea54..346b78b2c 100644
--- a/share/completions/watch.fish
+++ b/share/completions/watch.fish
@@ -1,14 +1,14 @@
-complete -c watch -s b -l beep             -d 'Beep if command has a non-zero exit'
-complete -c watch -s c -l color            -d 'Interpret ANSI color sequences'
-complete -c watch -s d -l differences      -d 'Highlight changes between updates'
-complete -c watch -s d -l differences=permanent  -d 'Highlight changes between updates'
-complete -c watch -s e -l errexit          -d 'Exit if command has a non-zero exit'
-complete -c watch -s g -l chgexit          -d 'Exit when output from command changes'
-complete -c watch -s n -l interval         -d 'Seconds to wait between updates' -x
-complete -c watch -s p -l precise          -d 'Attempt run command in precise intervals'
-complete -c watch -s t -l no-title         -d 'Turn off header'
-complete -c watch -s x -l exec             -d 'Pass command to exec instead of "sh -c"'
-complete -c watch -s h -l help             -d 'Display this help and exit'
-complete -c watch -s v -l version          -d 'Output version information and exit'
+complete -c watch -s b -l beep -d 'Beep if command has a non-zero exit'
+complete -c watch -s c -l color -d 'Interpret ANSI color sequences'
+complete -c watch -s d -l differences -d 'Highlight changes between updates'
+complete -c watch -s d -l differences=permanent -d 'Highlight changes between updates'
+complete -c watch -s e -l errexit -d 'Exit if command has a non-zero exit'
+complete -c watch -s g -l chgexit -d 'Exit when output from command changes'
+complete -c watch -s n -l interval -d 'Seconds to wait between updates' -x
+complete -c watch -s p -l precise -d 'Attempt run command in precise intervals'
+complete -c watch -s t -l no-title -d 'Turn off header'
+complete -c watch -s x -l exec -d 'Pass command to exec instead of "sh -c"'
+complete -c watch -s h -l help -d 'Display this help and exit'
+complete -c watch -s v -l version -d 'Output version information and exit'
 complete -c watch -xa '(__fish_complete_subcommand -- -n --interval)'
 
diff --git a/share/completions/wget.fish b/share/completions/wget.fish
index 6a7d9afa1..8d860bc48 100644
--- a/share/completions/wget.fish
+++ b/share/completions/wget.fish
@@ -20,7 +20,7 @@ complete -c wget -l bind-adress -d "Bind address on local machine" -xa "(__fish_
 complete -c wget -s t -l tries -d "Set number of retries to number" -xa "0 1 2 4 8 16 32 64 128"
 complete -c wget -s O -l output-document -d "Concatenate output to file" -r
 complete -c wget -l no-clobber -d "Never overwrite files with same name"
-complete -c wget -o nc  -d "Never overwrite files with same name"
+complete -c wget -o nc -d "Never overwrite files with same name"
 complete -c wget -s c -l continue -d "Continue getting a partially-downloaded file"
 complete -c wget -l progress -d "Select progress meter type" -a "
 	dot\t'Print one dot for every kB of data, 50 dots per line'
@@ -129,5 +129,5 @@ complete -c wget -s L -l relative -d "Follow relative links only"
 complete -c wget -s I -l include-directories -d "Specify a comma-separated list of directories you wish to follow" -x
 complete -c wget -s X -l exclude-directories -d "Specify a comma-separated list of directories you wish to exclude" -x
 complete -c wget -l no-parent -d "Do not ever ascend to the parent directory"
-complete -c wget -o np  -d "Do not ever ascend to the parent directory"
+complete -c wget -o np -d "Do not ever ascend to the parent directory"
 
diff --git a/share/completions/which.fish b/share/completions/which.fish
index aaca38272..d6c6decef 100644
--- a/share/completions/which.fish
+++ b/share/completions/which.fish
@@ -1,4 +1,4 @@
-if which -v > /dev/null 2>/dev/null # GNU
+if which -v >/dev/null 2>/dev/null # GNU
     complete -c which -s a -l all -d "Print all matching executables in PATH, not just the first"
     complete -c which -s i -l read-alias -d "Read aliases from stdin, reporting matching ones on stdout"
     complete -c which -l skip-alias -d "Ignore option '--read-alias'"
diff --git a/share/completions/wicd-cli.fish b/share/completions/wicd-cli.fish
index 78008fd0f..da42854c9 100644
--- a/share/completions/wicd-cli.fish
+++ b/share/completions/wicd-cli.fish
@@ -1,15 +1,15 @@
 complete -c wicd-cli -s h -l help -d 'Print help and exit'
 complete -c wicd-cli -s S -l scan -d 'Scan for networks'
-complete -c wicd-cli -s l -l list-networks   -d 'List networks'
+complete -c wicd-cli -s l -l list-networks -d 'List networks'
 complete -c wicd-cli -s d -l network-details -d 'Show network details'
-complete -c wicd-cli -s x -l disconnect      -d 'Disconnect'
-complete -c wicd-cli -s c -l connect         -d 'Connect'
+complete -c wicd-cli -s x -l disconnect -d 'Disconnect'
+complete -c wicd-cli -s c -l connect -d 'Connect'
 complete -c wicd-cli -s e -l list-encryption-types -d 'List encryption types'
-complete -c wicd-cli -s y -l wireless        -d 'Perform operation on wireless network'
-complete -c wicd-cli -s z -l wired           -d 'Perform operation on wired network'
-complete -c wicd-cli -s w -l save            -d 'Save profile'
-complete -c wicd-cli -s o -l load-profile    -d 'Load profile'
-complete -c wicd-cli -s m -l name            -d 'Set name for profile to save/load'
+complete -c wicd-cli -s y -l wireless -d 'Perform operation on wireless network'
+complete -c wicd-cli -s z -l wired -d 'Perform operation on wired network'
+complete -c wicd-cli -s w -l save -d 'Save profile'
+complete -c wicd-cli -s o -l load-profile -d 'Load profile'
+complete -c wicd-cli -s m -l name -d 'Set name for profile to save/load'
 complete -c wicd-cli -s p -l network-property -r -d 'Get or set network property'
 complete -c wicd-cli -s s -l set-to -r -d 'Set network property to'
 complete -c wicd-cli -s n -l network -d 'Set the network'
diff --git a/share/completions/wicd-client.fish b/share/completions/wicd-client.fish
index b439f360d..ddc39eb99 100644
--- a/share/completions/wicd-client.fish
+++ b/share/completions/wicd-client.fish
@@ -1,6 +1,6 @@
-complete -c wicd-client -s t -l tray	   -d 'Run the wicd tray icon only.'
-complete -c wicd-client -s n -l no-tray	   -d 'Run wicd without the tray icon.'
-complete -c wicd-client -s h -l help       -d 'Print this help information.'
+complete -c wicd-client -s t -l tray -d 'Run the wicd tray icon only.'
+complete -c wicd-client -s n -l no-tray -d 'Run wicd without the tray icon.'
+complete -c wicd-client -s h -l help -d 'Print this help information.'
 complete -c wicd-client -s a -l no-animate -d 'Run the tray without network traffic tray animations.'
 complete -c wicd-client -s o -l only-notifications -d 'Don\'t display anything except notifications.'
 
diff --git a/share/completions/wicd-gtk.fish b/share/completions/wicd-gtk.fish
index 488f84903..f204b60c6 100644
--- a/share/completions/wicd-gtk.fish
+++ b/share/completions/wicd-gtk.fish
@@ -1,6 +1,6 @@
-complete -c wicd-gtk -s t -l tray	   -d 'Run the wicd tray icon only.'
-complete -c wicd-gtk -s n -l no-tray	   -d 'Run wicd without the tray icon.'
-complete -c wicd-gtk -s h -l help       -d 'Print this help information.'
+complete -c wicd-gtk -s t -l tray -d 'Run the wicd tray icon only.'
+complete -c wicd-gtk -s n -l no-tray -d 'Run wicd without the tray icon.'
+complete -c wicd-gtk -s h -l help -d 'Print this help information.'
 complete -c wicd-gtk -s a -l no-animate -d 'Run the tray without network traffic tray animations.'
 complete -c wicd-gtk -s o -l only-notifications -d 'Don\'t display anything except notifications.'
 
diff --git a/share/completions/xdg-mime.fish b/share/completions/xdg-mime.fish
index ff8543d39..00153e26d 100644
--- a/share/completions/xdg-mime.fish
+++ b/share/completions/xdg-mime.fish
@@ -13,16 +13,16 @@ complete -c xdg-mime -d 'Query file\'s filetype' -n 'contains_seq query filetype
 
 # complete xdg-mime default
 complete -c xdg-mime -d 'Choose application' -n '__fish_seen_subcommand_from default; and __fish_is_token_n 3' -xa '(__fish_print_xdg_desktop_file_ids)'
-complete -c xdg-mime -d 'Mimetype'           -n '__fish_seen_subcommand_from default; and __fish_is_token_n 4' -xa '(__fish_print_xdg_mimetypes)'
+complete -c xdg-mime -d 'Mimetype' -n '__fish_seen_subcommand_from default; and __fish_is_token_n 4' -xa '(__fish_print_xdg_mimetypes)'
 
 # complete xdg-mime install
 complete -c xdg-mime -d 'Add filetype description' -n 'contains_seq xdg-mime install -- (commandline -cop)' -r
-complete -c xdg-mime -d 'Set mode'                 -n 'contains_seq xdg-mime install -- (commandline -cop)' -l mode -xa 'user system'
-complete -c xdg-mime -d 'Disable vendor check'     -n 'contains_seq xdg-mime install -- (commandline -cop)' -l novendor
+complete -c xdg-mime -d 'Set mode' -n 'contains_seq xdg-mime install -- (commandline -cop)' -l mode -xa 'user system'
+complete -c xdg-mime -d 'Disable vendor check' -n 'contains_seq xdg-mime install -- (commandline -cop)' -l novendor
 
 # complete xdg-mime uninstall
 complete -c xdg-mime -d 'Remove filetype description' -n 'contains_seq xdg-mime uninstall -- (commandline -cop)' -r
-complete -c xdg-mime -d 'Set mode'                    -n 'contains_seq xdg-mime uninstall -- (commandline -cop)' -l mode -xa 'user system'
+complete -c xdg-mime -d 'Set mode' -n 'contains_seq xdg-mime uninstall -- (commandline -cop)' -l mode -xa 'user system'
 
 #complete -c xdg-mime install [--mode mode] [--novendor] mimetypes-file
 #complete -c xdg-mime uninstall [--mode mode] mimetypes-file
diff --git a/share/completions/xinput.fish b/share/completions/xinput.fish
index eadf40ae2..b27746ca1 100644
--- a/share/completions/xinput.fish
+++ b/share/completions/xinput.fish
@@ -2,9 +2,9 @@
 set -l cmds version list get-feedbacks set-pointer set-mode set-ptr-feedback set-integer-feedback set-button-map query-state list-props set-int-prop set-float-prop set-prop watch-props delete-prop test test-xi2 create-master remove-master reattach float set-cp map-to-output enable disable
 
 function __fish_xinput_devices
-	# Yeah, this includes a "↳" char
-	# There's either this or printing only name or id, not both
-	xinput list --short | string replace -r '^[\W↳]*([\w/ ]+)\s+id=([0-9]+).*$' '$2\t$1'
+    # Yeah, this includes a "↳" char
+    # There's either this or printing only name or id, not both
+    xinput list --short | string replace -r '^[\W↳]*([\w/ ]+)\s+id=([0-9]+).*$' '$2\t$1'
 end
 
 complete -c xinput -f -n "not __fish_seen_subcommand_from $cmds" -a "$cmds"
diff --git a/share/completions/xrandr.fish b/share/completions/xrandr.fish
index 2eed8e9f3..f1db5ce53 100644
--- a/share/completions/xrandr.fish
+++ b/share/completions/xrandr.fish
@@ -1,28 +1,28 @@
 function __fish_print_xrandr_outputs --description 'Print xrandr outputs'
-	xrandr | string replace -r --filter '^(\S+)\s+(.*)$' '$1\t$2' | string match -v -e Screen
+    xrandr | string replace -r --filter '^(\S+)\s+(.*)$' '$1\t$2' | string match -v -e Screen
 end
 
 function __fish_print_xrandr_modes --description 'Print xrandr modes'
-	set -l output
-	xrandr | string match -v -r '^(Screen|\s{4,})' | while read line
-		switch $line
-		case '  *'
-			string trim $line | string replace -r '^(\S+)\s+(.*)$' "\$1\t\$2 [$output]"
-		case '*'
-			set output (string match -r '^\S+' $line)
-		end
-	end
+    set -l output
+    xrandr | string match -v -r '^(Screen|\s{4,})' | while read line
+        switch $line
+            case '  *'
+                string trim $line | string replace -r '^(\S+)\s+(.*)$' "\$1\t\$2 [$output]"
+            case '*'
+                set output (string match -r '^\S+' $line)
+        end
+    end
 end
 complete -c xrandr -l verbose -d 'Be more verbose'
-complete -c xrandr -l dryrun  -d 'Make no changes'
-complete -c xrandr -l nograb  -d 'Apply modifications without grabbing the screen'
-complete -c xrandr -o help  -d 'Print out a summary of the usage and exit'
+complete -c xrandr -l dryrun -d 'Make no changes'
+complete -c xrandr -l nograb -d 'Apply modifications without grabbing the screen'
+complete -c xrandr -o help -d 'Print out a summary of the usage and exit'
 complete -c xrandr -s v -l version -d 'Print out the RandR version reported by the X server and exit'
-complete -c xrandr -s q -l query   -d 'Display the current state of the system'
+complete -c xrandr -s q -l query -d 'Display the current state of the system'
 complete -c xrandr -s d -o display -d 'Select X display to use' -x
 complete -c xrandr -l screen -d 'Select which screen to manipulate' -x
-complete -c xrandr -l q1    -d 'Use RandR version 1.1 protocol'
-complete -c xrandr -l q12   -d 'Use RandR version 1.2 protocol'
+complete -c xrandr -l q1 -d 'Use RandR version 1.1 protocol'
+complete -c xrandr -l q12 -d 'Use RandR version 1.2 protocol'
 
 set -l ver (xrandr -v | string replace -rf '.*RandR version ([0-9.]+)$' '$1' | string split ".")
 if not set -q ver[1]
@@ -36,8 +36,8 @@ end
 complete -c xrandr -s s -l size -d 'Set the screen size (index or width x height)' -x
 complete -c xrandr -s r -l rate -l refresh -d 'Set the refresh rate closest to the specified value' -x
 complete -c xrandr -s o -l orientation -d 'Specify the orientation of the screen' -xa 'normal inverted left right'
-complete -c xrandr -s x                -d 'Reflect across the X axis'
-complete -c xrandr -s y                -d 'Reflect across the Y axis'
+complete -c xrandr -s x -d 'Reflect across the X axis'
+complete -c xrandr -s y -d 'Reflect across the Y axis'
 
 # Version > 1.1
 if test $ver[1] -gt 1; or test "$ver[2]" -gt 1
@@ -57,11 +57,11 @@ if test $ver[1] -gt 1; or test "$ver[2]" -gt 1
     complete -c xrandr -l rate -d 'Set refresh rate' -x
     complete -c xrandr -l reflect -d 'Set reflection' -xa 'normal x y xy'
     complete -c xrandr -l rotate -d 'Set rotation' -xa 'normal left right inverted'
-    complete -c xrandr -l left-of  -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
+    complete -c xrandr -l left-of -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
     complete -c xrandr -l right-of -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
-    complete -c xrandr -l above    -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
-    complete -c xrandr -l below    -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
-    complete -c xrandr -l same-as  -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
+    complete -c xrandr -l above -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
+    complete -c xrandr -l below -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
+    complete -c xrandr -l same-as -d 'Set position relative to the output' -xa '(__fish_print_xrandr_outputs)'
     complete -c xrandr -l set -d 'Set the property value: --set <prop> <value>' -x
     complete -c xrandr -l off -d 'Disables the output'
     complete -c xrandr -l crtc -d 'Set the crtc' -x
@@ -72,7 +72,7 @@ end
 if test $ver[1] -gt 1; or test "$ver[2]" -gt 2
     complete -c xrandr -l noprimary -d "Don't define a primary output"
     complete -c xrandr -l current -d 'Print current screen configuration'
-    complete -c xrandr -l panning  -d 'Set panning: widthxheight[+x+y[/track_widthxtrack_height+track_x+track_y[/border_left/border_top/border_right/border_bottom]]]' -x
+    complete -c xrandr -l panning -d 'Set panning: widthxheight[+x+y[/track_widthxtrack_height+track_x+track_y[/border_left/border_top/border_right/border_bottom]]]' -x
     complete -c xrandr -l transform -d 'Set transformation matrix: a,b,c,d,e,f,g,h,i for [ [a,b,c], [d,e,f], [g,h,i] ]' -x
     complete -c xrandr -l scale -d 'Set scren scale' -x
     complete -c xrandr -l primary -d 'Set the output as primary'
diff --git a/share/completions/xrdb.fish b/share/completions/xrdb.fish
index edb5b2912..acad0a25a 100644
--- a/share/completions/xrdb.fish
+++ b/share/completions/xrdb.fish
@@ -1,21 +1,21 @@
-complete -c xrdb -o display          -d 'display to use'
-complete -c xrdb -o all              -d 'do all resources [default]'
-complete -c xrdb -o global           -d 'do screen-independent resources'
-complete -c xrdb -o screen           -d 'do screen-specific resources for one screen'
-complete -c xrdb -o screens          -d 'do screen-specific resources for all screens'
-complete -c xrdb -o n                -d 'show but don\'t do changes'
-complete -c xrdb -o cpp -r           -d 'preprocessor to use [/usr/bin/mcpp]'
-complete -c xrdb -o nocpp            -d 'do not use a preprocessor'
-complete -c xrdb -o query            -d 'query resources'
-complete -c xrdb -o load             -d 'load resources from file [default]'
-complete -c xrdb -o override         -d 'add in resources from file'
-complete -c xrdb -o merge            -d 'merge resources from file & sort'
-complete -c xrdb -o edit -r          -d 'edit resources into file'
-complete -c xrdb -o backup -x        -d 'backup suffix for -edit [.bak]'
-complete -c xrdb -o symbols          -d 'show preprocessor symbols'
-complete -c xrdb -o remove           -d 'remove resources'
-complete -c xrdb -o retain           -d 'avoid server reset (avoid using this)'
-complete -c xrdb -o quiet            -d 'don\'t warn about duplicates'
+complete -c xrdb -o display -d 'display to use'
+complete -c xrdb -o all -d 'do all resources [default]'
+complete -c xrdb -o global -d 'do screen-independent resources'
+complete -c xrdb -o screen -d 'do screen-specific resources for one screen'
+complete -c xrdb -o screens -d 'do screen-specific resources for all screens'
+complete -c xrdb -o n -d 'show but don\'t do changes'
+complete -c xrdb -o cpp -r -d 'preprocessor to use [/usr/bin/mcpp]'
+complete -c xrdb -o nocpp -d 'do not use a preprocessor'
+complete -c xrdb -o query -d 'query resources'
+complete -c xrdb -o load -d 'load resources from file [default]'
+complete -c xrdb -o override -d 'add in resources from file'
+complete -c xrdb -o merge -d 'merge resources from file & sort'
+complete -c xrdb -o edit -r -d 'edit resources into file'
+complete -c xrdb -o backup -x -d 'backup suffix for -edit [.bak]'
+complete -c xrdb -o symbols -d 'show preprocessor symbols'
+complete -c xrdb -o remove -d 'remove resources'
+complete -c xrdb -o retain -d 'avoid server reset (avoid using this)'
+complete -c xrdb -o quiet -d 'don\'t warn about duplicates'
 #complete -c xrdb -s Dname[=value],
 #complete -c xrdb -s Uname,
 #complete -c xrdb -s Idirectory  -d 'passed to preprocessor'
diff --git a/share/completions/xsv.fish b/share/completions/xsv.fish
index 508ca0ade..b793edf70 100644
--- a/share/completions/xsv.fish
+++ b/share/completions/xsv.fish
@@ -1,22 +1,22 @@
-complete -c xsv -n '__fish_is_first_token' -xa cat         -d 'Concatenate by row or column'
-complete -c xsv -n '__fish_is_first_token' -xa count       -d 'Count records'
-complete -c xsv -n '__fish_is_first_token' -xa fixlengths  -d 'Makes all records have same length'
-complete -c xsv -n '__fish_is_first_token' -xa flatten     -d 'Show one field per line'
-complete -c xsv -n '__fish_is_first_token' -xa fmt         -d 'Format CSV output (change field delimiter)'
-complete -c xsv -n '__fish_is_first_token' -xa frequency   -d 'Show frequency tables'
-complete -c xsv -n '__fish_is_first_token' -xa headers     -d 'Show header names'
-complete -c xsv -n '__fish_is_first_token' -xa help        -d 'Show this usage message.'
-complete -c xsv -n '__fish_is_first_token' -xa index       -d 'Create CSV index for faster access'
-complete -c xsv -n '__fish_is_first_token' -xa input       -d 'Read CSV data with special quoting rules'
-complete -c xsv -n '__fish_is_first_token' -xa join        -d 'Join CSV files'
-complete -c xsv -n '__fish_is_first_token' -xa sample      -d 'Randomly sample CSV data'
-complete -c xsv -n '__fish_is_first_token' -xa search      -d 'Search CSV data with regexes'
-complete -c xsv -n '__fish_is_first_token' -xa select      -d 'Select columns from CSV'
-complete -c xsv -n '__fish_is_first_token' -xa slice       -d 'Slice records from CSV'
-complete -c xsv -n '__fish_is_first_token' -xa sort        -d 'Sort CSV data'
-complete -c xsv -n '__fish_is_first_token' -xa split       -d 'Split CSV data into many files'
-complete -c xsv -n '__fish_is_first_token' -xa stats       -d 'Compute basic statistics'
-complete -c xsv -n '__fish_is_first_token' -xa table       -d 'Align CSV data into columns'
+complete -c xsv -n '__fish_is_first_token' -xa cat -d 'Concatenate by row or column'
+complete -c xsv -n '__fish_is_first_token' -xa count -d 'Count records'
+complete -c xsv -n '__fish_is_first_token' -xa fixlengths -d 'Makes all records have same length'
+complete -c xsv -n '__fish_is_first_token' -xa flatten -d 'Show one field per line'
+complete -c xsv -n '__fish_is_first_token' -xa fmt -d 'Format CSV output (change field delimiter)'
+complete -c xsv -n '__fish_is_first_token' -xa frequency -d 'Show frequency tables'
+complete -c xsv -n '__fish_is_first_token' -xa headers -d 'Show header names'
+complete -c xsv -n '__fish_is_first_token' -xa help -d 'Show this usage message.'
+complete -c xsv -n '__fish_is_first_token' -xa index -d 'Create CSV index for faster access'
+complete -c xsv -n '__fish_is_first_token' -xa input -d 'Read CSV data with special quoting rules'
+complete -c xsv -n '__fish_is_first_token' -xa join -d 'Join CSV files'
+complete -c xsv -n '__fish_is_first_token' -xa sample -d 'Randomly sample CSV data'
+complete -c xsv -n '__fish_is_first_token' -xa search -d 'Search CSV data with regexes'
+complete -c xsv -n '__fish_is_first_token' -xa select -d 'Select columns from CSV'
+complete -c xsv -n '__fish_is_first_token' -xa slice -d 'Slice records from CSV'
+complete -c xsv -n '__fish_is_first_token' -xa sort -d 'Sort CSV data'
+complete -c xsv -n '__fish_is_first_token' -xa split -d 'Split CSV data into many files'
+complete -c xsv -n '__fish_is_first_token' -xa stats -d 'Compute basic statistics'
+complete -c xsv -n '__fish_is_first_token' -xa table -d 'Align CSV data into columns'
 
 # with a subcommand
 complete -c xsv -n 'not __fish_is_first_token' -xa '(__fish_complete_suffix .csv)'
diff --git a/share/completions/yaourt.fish b/share/completions/yaourt.fish
index 9428df99a..e5a186cfb 100644
--- a/share/completions/yaourt.fish
+++ b/share/completions/yaourt.fish
@@ -39,11 +39,11 @@ complete -c $progname -s F -f -l files -n $noopt -d 'Query the files database'
 complete -c $progname -s V -f -l version -d 'Display version and exit'
 complete -c $progname -s h -f -l help -d 'Display help'
 # $progname operations
-complete -c $progname -n $noopt -s B    -l backup      -d "Backup or restore alpm local database"
-complete -c $progname -n $noopt -s C -f                -d "Manage .pac* files"
+complete -c $progname -n $noopt -s B -l backup -d "Backup or restore alpm local database"
+complete -c $progname -n $noopt -s C -f -d "Manage .pac* files"
 complete -c $progname -n $noopt -s G -f -l getpkgbuild -d "Get PKGBUILD from ABS or AUR"
-complete -c $progname -n $noopt -s P    -l pkgbuild    -d "Build package from PKGBUILD found in a local directory"
-complete -c $progname -n $noopt      -f -l stats       -d "Show some statistics about your packages"
+complete -c $progname -n $noopt -s P -l pkgbuild -d "Build package from PKGBUILD found in a local directory"
+complete -c $progname -n $noopt -f -l stats -d "Show some statistics about your packages"
 
 # General options
 # Only offer these once a command has been given so they get prominent display
@@ -59,14 +59,14 @@ complete -c $progname -n $hasopt -l hookdir -d 'Hook file directory'
 complete -c $progname -n $hasopt -l logfile -d 'Specify alternative log file'
 complete -c $progname -n $hasopt -l noconfirm -d 'Bypass any question' -f
 # General options (yaourt only)
-complete -c $progname -n $hasopt -l color     -d 'Force color'
-complete -c $progname -n $hasopt -l force     -d 'Force installation or updates'
-complete -c $progname -n $hasopt -l insecure  -d 'Allow to perform "insecure" SSL connections'
-complete -c $progname -n $hasopt -l nocolor   -d 'Disable color'
-complete -c $progname -n $hasopt -l confirm   -d 'Always ask for confirmation'
-complete -c $progname -n $hasopt -l pager     -d 'Use $PAGER to show search results'
+complete -c $progname -n $hasopt -l color -d 'Force color'
+complete -c $progname -n $hasopt -l force -d 'Force installation or updates'
+complete -c $progname -n $hasopt -l insecure -d 'Allow to perform "insecure" SSL connections'
+complete -c $progname -n $hasopt -l nocolor -d 'Disable color'
+complete -c $progname -n $hasopt -l confirm -d 'Always ask for confirmation'
+complete -c $progname -n $hasopt -l pager -d 'Use $PAGER to show search results'
 complete -c $progname -n $hasopt -l export -x -a '(__fish_complete_directories)' -d 'Export built packages and their sources to DIR'
-complete -c $progname -n $hasopt -l tmp    -x -a '(__fish_complete_directories)' -d 'Use DIR as temporary folder'
+complete -c $progname -n $hasopt -l tmp -x -a '(__fish_complete_directories)' -d 'Use DIR as temporary folder'
 
 # Transaction options (sync, remove, upgrade)
 for condition in sync remove upgrade
@@ -101,10 +101,10 @@ for condition in query sync
     complete -c $progname -n $$condition -s s -l search -r -d 'Search packages for regexp' -f
     # Yaourt only
     complete -c $progname -n $$condition -l conflicts -d 'Show packages that conflict with one of the targets'
-    complete -c $progname -n $$condition -l depends   -d 'Show packages that depend on one of the targets'
-    complete -c $progname -n $$condition -l provides  -d 'Show packages that provide one of the targets'
-    complete -c $progname -n $$condition -l replaces  -d 'Show packages that replace one of the targets'
-    complete -c $progname -n $$condition -l nameonly  -d 'Query the package names only'
+    complete -c $progname -n $$condition -l depends -d 'Show packages that depend on one of the targets'
+    complete -c $progname -n $$condition -l provides -d 'Show packages that provide one of the targets'
+    complete -c $progname -n $$condition -l replaces -d 'Show packages that replace one of the targets'
+    complete -c $progname -n $$condition -l nameonly -d 'Query the package names only'
 end
 
 # Query options
@@ -122,7 +122,7 @@ complete -c $progname -n "$query" -d 'Installed package' -xa $listinstalled -f
 # Yaourt only query options
 # Backup file is always saved as pacman-$date.tar.bz2
 complete -c $progname -n $query -r -l backupfile -a '(__fish_complete_suffix tar.bz2)' -d 'Query FILE instead of alpm/aur'
-complete -c $progname -n $query    -l date       -d 'List queries result sorted by installation date'
+complete -c $progname -n $query -l date -d 'List queries result sorted by installation date'
 
 # Remove options
 complete -c $progname -n $remove -s c -l cascade -d 'Also remove packages depending on PACKAGE' -f
@@ -140,15 +140,15 @@ complete -c $progname -n $sync -s w -l downloadonly -d 'Only download the target
 complete -c $progname -n $sync -s y -l refresh -d 'Download fresh copy of the package list'
 complete -c $progname -n "$sync" -xa "$listall $listgroups"
 # Additional sync options
-complete -c $progname -n $sync -s a -l aur           -d 'Also search in AUR database'
-complete -c $progname -n $sync -s A -l ignorearch    -d 'Pass -A or --ignorearch option to makepkg'
-complete -c $progname -n $sync      -l aur-url    -x -d 'Specify a custom AUR url'
+complete -c $progname -n $sync -s a -l aur -d 'Also search in AUR database'
+complete -c $progname -n $sync -s A -l ignorearch -d 'Pass -A or --ignorearch option to makepkg'
+complete -c $progname -n $sync -l aur-url -x -d 'Specify a custom AUR url'
 set -l has_build_opt '__fish_contains_opt -s b build'
 complete -c $progname -n "$sync; and not $has_build_opt" -s b -l build -d 'Build from sources(AUR or ABS)'
 complete -c $progname -n "$sync; and     $has_build_opt" -s b -l build -d 'Also build all dependencies'
-complete -c $progname -n $sync      -l devel         -d 'Search an update for devel packages'
-complete -c $progname -n $sync      -l maintainer    -d 'Search packages by maintainer instead of name (AUR only)'
-complete -c $progname -n $sync      -l m-arg         -d 'Pass additional options to makepkg'
+complete -c $progname -n $sync -l devel -d 'Search an update for devel packages'
+complete -c $progname -n $sync -l maintainer -d 'Search packages by maintainer instead of name (AUR only)'
+complete -c $progname -n $sync -l m-arg -d 'Pass additional options to makepkg'
 
 # Database options
 set -l has_db_opt '__fish_contains_opt asdeps asexplicit'
diff --git a/share/completions/yarn.fish b/share/completions/yarn.fish
index eed79e7fe..0829ede78 100644
--- a/share/completions/yarn.fish
+++ b/share/completions/yarn.fish
@@ -79,7 +79,7 @@ for k,v in data["scripts"].items(): print(k + "\t" + v[:18])' <package.json 2>/d
         jq -r '.scripts | to_entries | map("\(.key)\t\(.value | tostring | .[0:20])") | .[]' package.json
     else if type -q jq
         # Yarn is quite slow and still requires `jq` because the normal format is unusable.
-        command yarn run --json 2> /dev/null | jq -r '.data.hints? | to_entries | map("\(.key)\t\(.value | tostring |.[0:20])") | .[]'
+        command yarn run --json 2>/dev/null | jq -r '.data.hints? | to_entries | map("\(.key)\t\(.value | tostring |.[0:20])") | .[]'
     end
 end
 
diff --git a/share/completions/yast2.fish b/share/completions/yast2.fish
index 4b1c80125..251b23670 100644
--- a/share/completions/yast2.fish
+++ b/share/completions/yast2.fish
@@ -1,11 +1,11 @@
 complete -f -c yast2 -a '(yast2 -l)' -d 'Module'
 
-complete -f -c yast2 -s h -l help           -d 'Show help'
-complete -f -c yast2 -s l -l list           -d 'List all available modules'
-complete -f -c yast2      -l qt             -d 'Use the QT graphical user interface'
-complete -f -c yast2      -l gtk            -d 'Use the GTK graphical user interface'
-complete -f -c yast2      -l ncurses        -d 'Use the NCURSES text-mode user interface'
-complete -f -c yast2 -s g -l geometry       -d 'Default window size (qt only)'
-complete -f -c yast2      -l noborder       -d 'No window manager border for main window'
-complete -f -c yast2      -l fullscreen     -d 'Use full screen'
+complete -f -c yast2 -s h -l help -d 'Show help'
+complete -f -c yast2 -s l -l list -d 'List all available modules'
+complete -f -c yast2 -l qt -d 'Use the QT graphical user interface'
+complete -f -c yast2 -l gtk -d 'Use the GTK graphical user interface'
+complete -f -c yast2 -l ncurses -d 'Use the NCURSES text-mode user interface'
+complete -f -c yast2 -s g -l geometry -d 'Default window size (qt only)'
+complete -f -c yast2 -l noborder -d 'No window manager border for main window'
+complete -f -c yast2 -l fullscreen -d 'Use full screen'
 
diff --git a/share/completions/yum.fish b/share/completions/yum.fish
index c229bcd03..7ddc15c6b 100644
--- a/share/completions/yum.fish
+++ b/share/completions/yum.fish
@@ -6,12 +6,12 @@
 
 # Test if completing using package names is appropriate
 function __fish_yum_package_ok
-	for i in (commandline -poc)
-		if contains -- $i update upgrade remove erase install reinstall
-			return 0
-		end
-	end
-	return 1
+    for i in (commandline -poc)
+        if contains -- $i update upgrade remove erase install reinstall
+            return 0
+        end
+    end
+    return 1
 end
 
 complete -c yum -n '__fish_use_subcommand' -xa install -d "Install the latest version of a package"
diff --git a/share/completions/zfs.fish b/share/completions/zfs.fish
index 914d27d70..8dd63fa7b 100644
--- a/share/completions/zfs.fish
+++ b/share/completions/zfs.fish
@@ -20,7 +20,7 @@ switch (uname)
         set OS "FreeBSD"
     case SunOS
         set OS "SunOS"
-    # Others?
+        # Others?
     case "*"
         set OS "unknown"
 end
@@ -110,7 +110,7 @@ function __fish_zfs_list_permissions
     echo -e "userused"
     # The remaining code of the function is almost a duplicate of __fish_complete_zfs_rw_properties and __fish_complete_zfs_ro_properties, but almost only, hence the duplication
     # RO properties
-    echo -e "volblocksize\t"(_ "Volume block size") 
+    echo -e "volblocksize\t"(_ "Volume block size")
     # R/W properties
     echo -e "aclinherit\t"(_ "Inheritance of ACL entries")" (discard, noallow, restricted, passthrough, passthrough-x)"
     echo -e "atime\t"(_ "Update access time on read")" (on, off)"
@@ -195,7 +195,9 @@ function __fish_zfs_list_permissions
         echo -e "casesensitivity\t"(_ "Case sensitivity")" (sensitive, insensitive, mixed)"
     end
     # Permissions set; if none are found, or if permission sets are not supported, no output is expected, even an error
-    for i in (zpool list -o name -H); zfs allow $i; end | string match -r '@[[:alnum:]]*' | sort -u
+    for i in (zpool list -o name -H)
+        zfs allow $i
+    end | string match -r '@[[:alnum:]]*' | sort -u
 end
 
 complete -c zfs -f -n '__fish_zfs_needs_command' -s '?' -a '?' -d 'Display a help message'
diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish
index fc93826c6..119294cfc 100644
--- a/share/completions/zpool.fish
+++ b/share/completions/zpool.fish
@@ -14,7 +14,7 @@ switch (uname)
         set OS "FreeBSD"
     case SunOS
         set OS "SunOS"
-    # Others?
+        # Others?
     case "*"
         set OS "unknown"
 end
@@ -80,12 +80,12 @@ function __fish_zpool_complete_vdevs
                     __fish_zpool_list_vdev_types
                 end
                 return
-            # Here, we accept any possible zpool command; this way, the developper will not have to augment or reduce the list when adding the current function to or removing it from the completions for the said command
+                # Here, we accept any possible zpool command; this way, the developper will not have to augment or reduce the list when adding the current function to or removing it from the completions for the said command
             case \? add attach clear create destroy detach events get history import iostat labelclear list offline online reguid reopen remove replace scrub set split status upgrade
                 __fish_zpool_list_vdev_types
                 return
             case "" # Au cas où
-                echo "" > /dev/null
+                echo "" >/dev/null
             case "-*" "*=*" "*,*"
                 # The token is an option or an option argument; as no option uses a vdev as its argument, we can abandon commandline parsing
                 __fish_zpool_list_vdev_types
diff --git a/share/completions/zypper.fish b/share/completions/zypper.fish
index 7719f1e2c..c84d2fd2f 100644
--- a/share/completions/zypper.fish
+++ b/share/completions/zypper.fish
@@ -8,31 +8,31 @@ set -g __fish_zypper_package_types package patch pattern product srcpackage appl
 set -g __fish_zypper_download_modes only in-advance in-heaps as-needed
 
 function __fish_zypper_cmd_in_array
-        for i in (commandline -pco)
-                # -- is used to provide no options for contains
-                # (if $i is equal to --optname without -- will be error)
-                if contains -- $i $argv
-                        return 0
-                end
+    for i in (commandline -pco)
+        # -- is used to provide no options for contains
+        # (if $i is equal to --optname without -- will be error)
+        if contains -- $i $argv
+            return 0
         end
+    end
 
-        return 1
+    return 1
 end
 
 function __fish_zypper_no_subcommand
-        not __fish_zypper_cmd_in_array $__fish_zypper_all_commands
+    not __fish_zypper_cmd_in_array $__fish_zypper_all_commands
 end
 
 function __fish_zypper_use_pkg
-        __fish_zypper_cmd_in_array $__fish_zypper_pkg_commands
+    __fish_zypper_cmd_in_array $__fish_zypper_pkg_commands
 end
 
 function __fish_zypper_use_repo
-        __fish_zypper_cmd_in_array $__fish_zypper_repo_commands
+    __fish_zypper_cmd_in_array $__fish_zypper_repo_commands
 end
 
 function __fish_zypper_not_use_file
-        not __fish_zypper_cmd_in_array $__fish_zypper_file_commands
+    not __fish_zypper_cmd_in_array $__fish_zypper_file_commands
 end
 
 function __fish_zypper_print_repos
@@ -91,486 +91,486 @@ complete -f -n '__fish_zypper_not_use_file' -c zypper
 
 complete -n '__fish_zypper_no_subcommand' -c zypper -a 'install in' -d 'Install packages'
 
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?'                     -d 'Print help'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'shell sh'                   -d 'Accept multiple commands at once'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr'                   -d 'List all defined repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar'                 -d 'Add a new repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removerepo rr'              -d 'Remove specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'renamerepo nr'              -d 'Rename specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyrepo mr'              -d 'Modify specified repository'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref'                -d 'Refresh all repositories'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc'                   -d 'Clean local caches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls'                -d 'List all defined services'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as'              -d 'Add a new service'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyservice ms'           -d 'Modify specified service'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removeservice rs'           -d 'Remove specified service'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh-services refs'      -d 'Refresh all services'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install in'                 -d 'Install packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm'                  -d 'Remove packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve'                  -d 'Verify integrity of package dependencies'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-install si'          -d 'Install source packages and their build dependencies'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'help ?' -d 'Print help'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'shell sh' -d 'Accept multiple commands at once'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'repos lr' -d 'List all defined repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addrepo ar' -d 'Add a new repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removerepo rr' -d 'Remove specified repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'renamerepo nr' -d 'Rename specified repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyrepo mr' -d 'Modify specified repository'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh ref' -d 'Refresh all repositories'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'clean cc' -d 'Clean local caches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'services ls' -d 'List all defined services'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addservice as' -d 'Add a new service'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'modifyservice ms' -d 'Modify specified service'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removeservice rs' -d 'Remove specified service'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'refresh-services refs' -d 'Refresh all services'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install in' -d 'Install packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'remove rm' -d 'Remove packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'verify ve' -d 'Verify integrity of package dependencies'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-install si' -d 'Install source packages and their build dependencies'
 complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'install-new-recommends inr' -d 'Install newly added packages recommended by installed packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up'                  -d 'Update installed packages with newer versions'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu'            -d 'List available updates'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch'                      -d 'Install needed patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp'            -d 'List needed patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'dist-upgrade dup'           -d 'Perform a distribution upgrade'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-check pchk'           -d 'Check for patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se'                  -d 'Search for packages matching a pattern'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if'                    -d 'Show full information for specified packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info'                 -d 'Show full information for specified patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info'               -d 'Show full information for specified patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info'               -d 'Show full information for specified products'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch'                -d 'List all available patches'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa'                -d 'List all available packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt'                -d 'List all available patterns'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd'                -d 'List all available products'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'what-provides wp'           -d 'List packages providing specified capability'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al'                 -d 'Add a package lock'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelock rl'              -d 'Remove a package lock'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll'                   -d 'List current package locks'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'cleanlocks cl'              -d 'Remove unused locks'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'versioncmp vcmp'            -d 'Compare two version strings'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos'               -d 'Print the target operating system ID string'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses'                   -d 'Print report about licenses and EULAs of installed packages'
-complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-download'            -d 'Download source rpms for all installed packages to a local directory'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'update up' -d 'Update installed packages with newer versions'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-updates lu' -d 'List available updates'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch' -d 'Install needed patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'list-patches lp' -d 'List needed patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'dist-upgrade dup' -d 'Perform a distribution upgrade'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-check pchk' -d 'Check for patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'search se' -d 'Search for packages matching a pattern'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'info if' -d 'Show full information for specified packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patch-info' -d 'Show full information for specified patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'pattern-info' -d 'Show full information for specified patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'product-info' -d 'Show full information for specified products'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patches pch' -d 'List all available patches'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'packages pa' -d 'List all available packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'patterns pt' -d 'List all available patterns'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'products pd' -d 'List all available products'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'what-provides wp' -d 'List packages providing specified capability'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'addlock al' -d 'Add a package lock'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'removelock rl' -d 'Remove a package lock'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'locks ll' -d 'List current package locks'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'cleanlocks cl' -d 'Remove unused locks'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'versioncmp vcmp' -d 'Compare two version strings'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'targetos tos' -d 'Print the target operating system ID string'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'licenses' -d 'Print report about licenses and EULAs of installed packages'
+complete -f -n '__fish_zypper_no_subcommand' -c zypper -a 'source-download' -d 'Download source rpms for all installed packages to a local directory'
 
-complete -c zypper -n '__fish_zypper_no_subcommand' -l help -s h            -d 'Help'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l version -s V         -d 'Output the version number'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l config -s c -r       -d 'Use specified config file instead of the default'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet -s q           -d 'Suppress normal output, print only error messages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose -s v         -d 'Increase verbosity'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev -s A       -d 'Do not abbreviate text in tables'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style -s s     -d 'Table style (integer)'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible -s r  -d 'Turn on rug compatibility'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l help -s h -d 'Help'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l version -s V -d 'Output the version number'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l config -s c -r -d 'Use specified config file instead of the default'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l quiet -s q -d 'Suppress normal output, print only error messages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l verbose -s v -d 'Increase verbosity'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-abbrev -s A -d 'Do not abbreviate text in tables'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l table-style -s s -d 'Table style (integer)'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l rug-compatible -s r -d 'Turn on rug compatibility'
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive -s n -d 'Do not ask anything, use default answers automatically'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout -s x          -d 'Switch to XML output'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown -s i  -d 'Ignore unknown packages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo -s p       -d 'Use an additional repository'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D -r   -d 'Use alternative repository definition file directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir -s C -r    -d 'Use alternative directory for all caches'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l root -s R -r         -d 'Operate on a different root directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l xmlout -s x -d 'Switch to XML output'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l ignore-unknown -s i -d 'Ignore unknown packages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l plus-repo -s p -d 'Use an additional repository'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l reposd-dir -s D -r -d 'Use alternative repository definition file directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l cache-dir -s C -r -d 'Use alternative directory for all caches'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l root -s R -r -d 'Operate on a different root directory'
 
 complete -c zypper -n '__fish_zypper_no_subcommand' -l non-interactive-include-reboot-patches -d 'Do not treat patches as interactive, which have the rebootSuggested-flag set'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks                          -d 'Ignore GPG check failures and continue'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l gpg-auto-import-keys                   -d 'Automatically trust and import new repository signing keys'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-repositories                   -d 'Do not read meta-data from repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh                             -d 'Do not refresh the repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd                                  -d 'Ignore CD/DVD repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote                              -d 'Ignore remote repositories'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-system-resolvables             -d 'Do not read installed packages'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids                              -d 'Output a list of zypper user prompts'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata                               -d 'User defined transaction id used in history and plugins'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir -r                       -d 'Use alternative raw meta-data cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir -r                      -d 'Use alternative solv file cache directory'
-complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir -r                       -d 'Use alternative package cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-gpg-checks -d 'Ignore GPG check failures and continue'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l gpg-auto-import-keys -d 'Automatically trust and import new repository signing keys'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-repositories -d 'Do not read meta-data from repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-refresh -d 'Do not refresh the repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-cd -d 'Ignore CD/DVD repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l no-remote -d 'Ignore remote repositories'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l disable-system-resolvables -d 'Do not read installed packages'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l promptids -d 'Output a list of zypper user prompts'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l userdata -d 'User defined transaction id used in history and plugins'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l raw-cache-dir -r -d 'Use alternative raw meta-data cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l solv-cache-dir -r -d 'Use alternative solv file cache directory'
+complete -c zypper -n '__fish_zypper_no_subcommand' -l pkg-cache-dir -r -d 'Use alternative package cache directory'
 
 function __fish_zypper_is_subcommand_lr
-        __fish_zypper_cmd_in_array repos lr
+    __fish_zypper_cmd_in_array repos lr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export -s e -r         -d 'Export all defined repositories as a single local .repo file'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias -s a             -d 'Show also repository alias'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name -s n              -d 'Show also repository name'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri -s u               -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority -s p          -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh -s r           -d 'Show also the autorefresh flag'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details -s d           -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service -s s           -d 'Show also alias of parent service'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l export -s e -r -d 'Export all defined repositories as a single local .repo file'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l alias -s a -d 'Show also repository alias'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l name -s n -d 'Show also repository name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l refresh -s r -d 'Show also the autorefresh flag'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l service -s s -d 'Show also alias of parent service'
 complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri -s U       -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority -s P  -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias -s A     -d 'Sort the list by alias'
-complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name -s N      -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-alias -s A -d 'Sort the list by alias'
+complete -c zypper -n '__fish_zypper_is_subcommand_lr' -l sort-by-name -s N -d 'Sort the list by name'
 
 function __fish_zypper_is_subcommand_ar
-        __fish_zypper_cmd_in_array addrepo ar
+    __fish_zypper_cmd_in_array addrepo ar
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo -s r                       -d 'Just another means to specify a .repo file to read'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check -s c                      -d 'Probe URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check -s C                   -d "Don't probe URI, probe later during refresh"
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name -s n                       -d 'Specify descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable -s d                    -d 'Add the repository as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh -s f                    -d 'Enable autorefresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority -s p                   -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages -s k              -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages -s K           -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck -s g                   -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict                 -d 'Enable strict GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned         -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-repo    -d 'Enable GPG check but allow the repository metadata to be unsigned'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l repo -s r -d 'Just another means to specify a .repo file to read'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l check -s c -d 'Probe URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-check -s C -d "Don't probe URI, probe later during refresh"
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l name -s n -d 'Specify descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l disable -s d -d 'Add the repository as disabled'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l refresh -s f -d 'Enable autorefresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l priority -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck -s G                -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_ar' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
 
 function __fish_zypper_is_subcommand_rr
-        __fish_zypper_cmd_in_array removerepo rr
+    __fish_zypper_cmd_in_array removerepo rr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth  -d 'Ignore user authentication data in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-auth -d 'Ignore user authentication data in the URI'
 complete -c zypper -n '__fish_zypper_is_subcommand_rr' -l loose-query -d 'Ignore query string in the URI'
 
 function __fish_zypper_is_subcommand_mr
-        __fish_zypper_cmd_in_array modifyrepo mr
+    __fish_zypper_cmd_in_array modifyrepo mr
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name -s n                       -d 'Set a descriptive name for the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable -s d                    -d "Disable the repository"
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable -s e                     -d 'Enable the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh -s f                    -d 'Enable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh -s F                 -d 'Disable auto-refresh of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority -s p                   -d 'Set the priority of the repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages -s k              -d 'Enable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages -s K           -d 'Disable RPM files caching'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck -s g                   -d 'Enable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict                 -d 'Enable strict GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned         -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-repo    -d 'Enable GPG check but allow the repository metadata to be unsigned'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l name -s n -d 'Set a descriptive name for the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l disable -s d -d "Disable the repository"
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l enable -s e -d 'Enable the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l refresh -s f -d 'Enable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-refresh -s F -d 'Disable auto-refresh of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l priority -s p -d 'Set the priority of the repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l keep-packages -s k -d 'Enable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-keep-packages -s K -d 'Disable RPM files caching'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck -s g -d 'Enable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-strict -d 'Enable strict GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned -d 'Short hand for --gpgcheck-allow-unsigned-repo --gpgcheck-allow-unsigned-package'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-repo -d 'Enable GPG check but allow the repository metadata to be unsigned'
 complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l gpgcheck-allow-unsigned-package -d 'Enable GPG check but allow installing unsigned packages from this repository.'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck -s G                -d 'Disable GPG check for this repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all -s a                        -d 'Apply changes to all repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local -s l                      -d 'Apply changes to all local repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote -s t                     -d 'Apply changes to all remote repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type -s m                -d 'Apply changes to repositories of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l no-gpgcheck -s G -d 'Disable GPG check for this repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l all -s a -d 'Apply changes to all repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l local -s l -d 'Apply changes to all local repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l remote -s t -d 'Apply changes to all remote repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_mr' -l medium-type -s m -d 'Apply changes to repositories of specified type'
 
 function __fish_zypper_is_subcommand_ref
-        __fish_zypper_cmd_in_array refresh ref
+    __fish_zypper_cmd_in_array refresh ref
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force -s f          -d 'Force a complete refresh'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build -s b    -d 'Force rebuild of the database'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force -s f -d 'Force a complete refresh'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-build -s b -d 'Force rebuild of the database'
 complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l force-download -s d -d 'Force download of raw metadata'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only -s B     -d "Only build the database, don't download metadata"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only -s D  -d "Only download raw metadata, don't build the database"
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"           -d 'Refresh only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services -s s       -d 'Refresh also services before refreshing repos'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l build-only -s B -d "Only build the database, don't download metadata"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l download-only -s D -d "Only download raw metadata, don't build the database"
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Refresh only specified repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_ref' -l services -s s -d 'Refresh also services before refreshing repos'
 
 function __fish_zypper_is_subcommand_ls
-        __fish_zypper_cmd_in_array services ls
+    __fish_zypper_cmd_in_array services ls
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri -s u               -d 'Show also base URI of repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority -s p          -d 'Show also repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details -s d           -d 'Show more information like URI, priority, type'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos -s r        -d 'Show also repositories belonging to the services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l uri -s u -d 'Show also base URI of repositories'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l priority -s p -d 'Show also repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l details -s d -d 'Show more information like URI, priority, type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l with-repos -s r -d 'Show also repositories belonging to the services'
 complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l show-enabled-only -s E -d 'Show enabled repos only'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority -s P  -d 'Sort the list by repository priority'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri -s U       -d 'Sort the list by URI'
-complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name -s N      -d 'Sort the list by name'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-priority -s P -d 'Sort the list by repository priority'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-uri -s U -d 'Sort the list by URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_ls' -l sort-by-name -s N -d 'Sort the list by name'
 
 function __fish_zypper_is_subcommand_as
-        __fish_zypper_cmd_in_array addservice as
+    __fish_zypper_cmd_in_array addservice as
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l type -s t    -d 'Type of the service (ris)'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l type -s t -d 'Type of the service (ris)'
 complete -c zypper -n '__fish_zypper_is_subcommand_as' -l disable -s d -d 'Add the service as disabled'
-complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name -s n    -d 'Specify descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_as' -l name -s n -d 'Specify descriptive name for the service'
 
 function __fish_zypper_is_subcommand_ms
-        __fish_zypper_cmd_in_array modifyservice ms
+    __fish_zypper_cmd_in_array modifyservice ms
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable -s d       -d "Disable the service (but don't remove it)"
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable -s e        -d 'Enable a disabled service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh -s r       -d 'Enable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh -s R    -d 'Disable auto-refresh of the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name -s n          -d 'Set a descriptive name for the service'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable -s i  -d 'Add a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l disable -s d -d "Disable the service (but don't remove it)"
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l enable -s e -d 'Enable a disabled service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l refresh -s r -d 'Enable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l no-refresh -s R -d 'Disable auto-refresh of the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l name -s n -d 'Set a descriptive name for the service'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-enable -s i -d 'Add a RIS service repository to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l ar-to-disable -s I -d 'Add a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable -s j  -d 'Remove a RIS service repository to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-enable -s j -d 'Remove a RIS service repository to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l rr-to-disable -s J -d 'Remove a RIS service repository to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable -s k  -d 'Clear the list of RIS repositories to enable'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-enable -s k -d 'Clear the list of RIS repositories to enable'
 complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l cl-to-disable -s K -d 'Clear the list of RIS repositories to disable'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all -s a           -d 'Apply changes to all services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local -s l         -d 'Apply changes to all local services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote -s t        -d 'Apply changes to all remote services'
-complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type -s m   -d 'Apply changes to services of specified type'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l all -s a -d 'Apply changes to all services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l local -s l -d 'Apply changes to all local services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l remote -s t -d 'Apply changes to all remote services'
+complete -c zypper -n '__fish_zypper_is_subcommand_ms' -l medium-type -s m -d 'Apply changes to services of specified type'
 
 function __fish_zypper_is_subcommand_rs
-        __fish_zypper_cmd_in_array removeservice rs
+    __fish_zypper_cmd_in_array removeservice rs
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rs' -l loose-auth  -d 'Ignore user authentication data in the URI'
+complete -c zypper -n '__fish_zypper_is_subcommand_rs' -l loose-auth -d 'Ignore user authentication data in the URI'
 complete -c zypper -n '__fish_zypper_is_subcommand_rs' -l loose-query -d 'Ignore query string in the URI'
 
 function __fish_zypper_is_subcommand_refs
-        __fish_zypper_cmd_in_array refresh-services refs
+    __fish_zypper_cmd_in_array refresh-services refs
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_refs' -l with-repos -s r -d 'Refresh also repositories'
 
 function __fish_zypper_is_subcommand_in
-        __fish_zypper_cmd_in_array install in
+    __fish_zypper_cmd_in_array install in
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -f -r -a "(__fish_zypper_print_repos -e)"   -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l repo -s r -f -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l type -s t -f -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name -s n                     -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability -s C               -d 'Select packages by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force -s f                    -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l capability -s C -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force -s f -d 'Install even if the item is already installed (reinstall), downgraded or changes vendor or architecture'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-force-resolution -s R      -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run -s D                  -d 'Test the installation, do not actually install'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d            -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage                    -d 'Allow to replace a newer item with an older one.'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l debug-solver                  -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-recommends                 -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l recommends                    -d 'Install also recommended packages in addition to the required'
-complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force-resolution              -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l dry-run -s D -d 'Test the installation, do not actually install'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l oldpackage -d 'Allow to replace a newer item with an older one.'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l recommends -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_in' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l from -f -r -a "(__fish_zypper_print_repos -e)" -d 'Select packages from the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_in' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
 
 function __fish_zypper_is_subcommand_rm
-        __fish_zypper_cmd_in_array remove rm
+    __fish_zypper_cmd_in_array remove rm
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name -s n                -d 'Select packages by plain name, not by capability'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability -s C          -d 'Select packages by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l name -s n -d 'Select packages by plain name, not by capability'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l capability -s C -d 'Select packages by capability'
 complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps -s u          -d 'Automatically remove unneeded dependencies'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-clean-deps -s U       -d 'No automatic removal of unneeded dependencies'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run -s D             -d 'Test the removal, do not actually remove'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l debug-solver             -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l force-resolution         -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l clean-deps -s u -d 'Automatically remove unneeded dependencies'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l no-clean-deps -s U -d 'No automatic removal of unneeded dependencies'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l dry-run -s D -d 'Test the removal, do not actually remove'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_rm' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
 
 function __fish_zypper_is_subcommand_ve
-        __fish_zypper_cmd_in_array verify ve
+    __fish_zypper_cmd_in_array verify ve
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run -s D       -d 'Test the repair, do not actually do anything to the system'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l dry-run -s D -d 'Test the repair, do not actually do anything to the system'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download-only -s d -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-recommends      -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l no-recommends -d 'Do not install recommended packages, only required'
 complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l recommends         -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_ve' -l recommends -d 'Install also recommended packages in addition to the required'
 
 function __fish_zypper_is_subcommand_si
-        __fish_zypper_cmd_in_array source-install si
+    __fish_zypper_cmd_in_array source-install si
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l build-deps-only -s d -d 'Install only build dependencies of specified packages'
-complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps -s D   -d "Don't install build dependencies"
+complete -c zypper -n '__fish_zypper_is_subcommand_si' -l no-build-deps -s D -d "Don't install build dependencies"
 complete -c zypper -n '__fish_zypper_is_subcommand_si' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Install packages only from specified repositories'
 
 function __fish_zypper_is_subcommand_inr
-        __fish_zypper_cmd_in_array install-new-recommends inr
+    __fish_zypper_cmd_in_array install-new-recommends inr
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l dry-run -s D       -d 'Test the installation, do not actually install'
+complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l dry-run -s D -d 'Test the installation, do not actually install'
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download-only -s d -d 'Only download the packages, do not install'
 complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l debug-solver       -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_inr' -l debug-solver -d 'Create solver test case for debugging'
 
 function __fish_zypper_is_subcommand_up
-        __fish_zypper_cmd_in_array update up
+    __fish_zypper_cmd_in_array update up
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Load only the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-force-resolution -s R      -d 'Do not force the solver to find solution, let it ask'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run -s D                  -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d            -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive              -d 'Skip interactive updates'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-force-resolution -s R -d 'Do not force the solver to find solution, let it ask'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l dry-run -s D -d 'Test the update, do not actually update'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l skip-interactive -d 'Skip interactive updates'
 complete -c zypper -n '__fish_zypper_is_subcommand_up' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l force-resolution              -d 'Force the solver to find a solution (even an aggressive one)'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort                   -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l debug-solver                  -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-recommends                 -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_up' -l recommends                    -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l force-resolution -d 'Force the solver to find a solution (even an aggressive one)'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_up' -l recommends -d 'Install also recommended packages in addition to the required'
 
 function __fish_zypper_is_subcommand_lu
-        __fish_zypper_cmd_in_array list-updates lu
+    __fish_zypper_cmd_in_array list-updates lu
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'List only updates from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all -s a    -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'List only updates from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l all -s a -d 'List all packages for which newer versions are available, regardless whether they are installable or not'
 complete -c zypper -n '__fish_zypper_is_subcommand_lu' -l best-effort -d "Do a 'best effort' approach to update. Updates to a lower than the latest version are also acceptable"
 
 function __fish_zypper_is_subcommand_lp
-        __fish_zypper_cmd_in_array list-patches lp
+    __fish_zypper_cmd_in_array list-patches lp
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l bugzilla -s b -d 'List needed patches for Bugzilla issues'
 complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l category -s g -d 'List all patches in this category'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all -s a      -d 'List all patches, not only the needed ones'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"     -d 'List only patches from the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date          -d 'List patches issued up to the specified date <YYYY-MM-DD>'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve           -d 'List needed patches for CVE issues'
-complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issuesstring  -d 'Look for issues matching the specified string'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l all -s a -d 'List all patches, not only the needed ones'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'List only patches from the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l date -d 'List patches issued up to the specified date <YYYY-MM-DD>'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l cve -d 'List needed patches for CVE issues'
+complete -c zypper -n '__fish_zypper_is_subcommand_lp' -l issuesstring -d 'Look for issues matching the specified string'
 
 function __fish_zypper_is_subcommand_dup
-        __fish_zypper_cmd_in_array dist-upgrade dup
+    __fish_zypper_cmd_in_array dist-upgrade dup
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run -s D                  -d 'Test the upgrade, do not actually upgrade'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d            -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l debug-solver                  -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-recommends                 -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l recommends                    -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l dry-run -s D -d 'Test the upgrade, do not actually upgrade'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l recommends -d 'Install also recommended packages in addition to the required'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l from -f -r -a "(__fish_zypper_print_repos -e)" -d 'Restrict upgrade to specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-downgrade            -d 'Do not allow installed resolvables to be downgraded'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-downgrade               -d 'Allow installed resolvables to be downgraded'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-name-change          -d 'Do not allow installed resolvables to change name'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-name-change             -d 'Allow installed resolvables to change name'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-arch-change          -d 'Do not allow installed resolvables to change architectures'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-arch-change             -d 'Allow installed resolvables to change architectures'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-vendor-change        -d 'Do not allow installed resolvables to switch vendors'
-complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-vendor-change           -d 'Allow installed resolvables to switch vendors'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-downgrade -d 'Do not allow installed resolvables to be downgraded'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-downgrade -d 'Allow installed resolvables to be downgraded'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-name-change -d 'Do not allow installed resolvables to change name'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-name-change -d 'Allow installed resolvables to change name'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-arch-change -d 'Do not allow installed resolvables to change architectures'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-arch-change -d 'Allow installed resolvables to change architectures'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l no-allow-vendor-change -d 'Do not allow installed resolvables to switch vendors'
+complete -c zypper -n '__fish_zypper_is_subcommand_dup' -l allow-vendor-change -d 'Allow installed resolvables to switch vendors'
 
 function __fish_zypper_is_subcommand_pchk
-        __fish_zypper_cmd_in_array patch-check pchk
+    __fish_zypper_cmd_in_array patch-check pchk
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pchk' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Check for patches only in the specified repository'
 
 function __fish_zypper_is_subcommand_se
-        __fish_zypper_cmd_in_array search se
+    __fish_zypper_cmd_in_array search se
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l search-descriptions -s d -d 'Search also in package summaries and descriptions'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive -s C      -d 'Perform case-sensitive search'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only -s i      -d 'Show only packages that are already installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l uninstalled-only -s u    -d 'Show only packages that are not currently installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l case-sensitive -s C -d 'Perform case-sensitive search'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l installed-only -s i -d 'Show only packages that are already installed'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l uninstalled-only -s u -d 'Show only packages that are not currently installed'
 complete -c zypper -n '__fish_zypper_is_subcommand_se' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Search only for packages of the specified type'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Search only in the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details -s s             -d 'Show each available version in each repository on a separate line'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name             -d 'Sort packages by name (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo             -d 'Sort packages by repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-all                -d 'Search for a match with all search strings (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-any                -d 'Search for a match with any of the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings         -d 'Search for a match to partial words (default)'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words              -d 'Search for a match to whole words only'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact              -d 'Searches for an exact package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides                 -d 'Search for packages which provide the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends               -d 'Search for packages which recommend the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires                 -d 'Search for packages which require the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests                 -d 'Search for packages which suggest the search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts                -d 'Search packages conflicting with search strings'
-complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes                -d 'Search for packages which obsolete the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Search only in the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l details -s s -d 'Show each available version in each repository on a separate line'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-name -d 'Sort packages by name (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l sort-by-repo -d 'Sort packages by repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-all -d 'Search for a match with all search strings (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-any -d 'Search for a match with any of the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-substrings -d 'Search for a match to partial words (default)'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-words -d 'Search for a match to whole words only'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l match-exact -d 'Searches for an exact package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l provides -d 'Search for packages which provide the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l recommends -d 'Search for packages which recommend the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l requires -d 'Search for packages which require the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l suggests -d 'Search for packages which suggest the search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l conflicts -d 'Search packages conflicting with search strings'
+complete -c zypper -n '__fish_zypper_is_subcommand_se' -l obsoletes -d 'Search for packages which obsolete the search strings'
 
 function __fish_zypper_is_subcommand_if
-        __fish_zypper_cmd_in_array info if
+    __fish_zypper_cmd_in_array info if
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"  -d 'Work only with the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Work only with the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides   -d 'Show symbols the package provides'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires   -d 'Show symbols the package requires'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts  -d 'Show symbols the package conflicts with'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes  -d 'Show symbols the package obsoletes'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l provides -d 'Show symbols the package provides'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l requires -d 'Show symbols the package requires'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l conflicts -d 'Show symbols the package conflicts with'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l obsoletes -d 'Show symbols the package obsoletes'
 complete -c zypper -n '__fish_zypper_is_subcommand_if' -l recommends -d 'Show symbols the package recommends'
-complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests   -d 'Show symbols the package suggests'
+complete -c zypper -n '__fish_zypper_is_subcommand_if' -l suggests -d 'Show symbols the package suggests'
 
 function __fish_zypper_is_subcommand_pch
-        __fish_zypper_cmd_in_array patches pch
+    __fish_zypper_cmd_in_array patches pch
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pch' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
 
 function __fish_zypper_is_subcommand_pa
-        __fish_zypper_cmd_in_array packages pa
+    __fish_zypper_cmd_in_array packages pa
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only -s i   -d 'Show only installed packages'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l installed-only -s i -d 'Show only installed packages'
 complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l uninstalled-only -s u -d 'Show only packages which are not installed'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned              -d 'Show packages which are orphaned (without repository)'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested             -d 'Show packages which are suggested'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended           -d 'Show packages which are recommended'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded              -d 'Show packages which are unneeded'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name -s N     -d 'Sort the list by package name'
-complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo -s R     -d 'Sort the list by repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l orphaned -d 'Show packages which are orphaned (without repository)'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l suggested -d 'Show packages which are suggested'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l recommended -d 'Show packages which are recommended'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l unneeded -d 'Show packages which are unneeded'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-name -s N -d 'Sort the list by package name'
+complete -c zypper -n '__fish_zypper_is_subcommand_pa' -l sort-by-repo -s R -d 'Sort the list by repository'
 
 function __fish_zypper_is_subcommand_pt
-        __fish_zypper_cmd_in_array patterns pt
+    __fish_zypper_cmd_in_array patterns pt
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only -s i   -d 'Show only installed patterns'
+complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l installed-only -s i -d 'Show only installed patterns'
 complete -c zypper -n '__fish_zypper_is_subcommand_pt' -l uninstalled-only -s u -d 'Show only patterns which are not installed'
 
 function __fish_zypper_is_subcommand_pd
-        __fish_zypper_cmd_in_array products pd
+    __fish_zypper_cmd_in_array products pd
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Just another means to specify repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only -s i   -d 'Show only installed products'
+complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l installed-only -s i -d 'Show only installed products'
 complete -c zypper -n '__fish_zypper_is_subcommand_pd' -l uninstalled-only -s u -d 'Show only products which are not installed'
 
 function __fish_zypper_is_subcommand_al
-        __fish_zypper_cmd_in_array addlock al
+    __fish_zypper_cmd_in_array addlock al
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_al' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Restrict the lock to the specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_al' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Restrict the lock to the specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_al' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
 
 function __fish_zypper_is_subcommand_rl
-        __fish_zypper_cmd_in_array removelock rl
+    __fish_zypper_cmd_in_array removelock rl
 end
 
-complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l repo -s r -r -a "(__fish_zypper_print_repos -e)"   -d 'Remove only locks with specified repository'
+complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Remove only locks with specified repository'
 complete -c zypper -n '__fish_zypper_is_subcommand_rl' -l type -s t -r -a "$__fish_zypper_package_types" -d 'Type of package'
 
 function __fish_zypper_is_subcommand_cl
-        __fish_zypper_cmd_in_array cleanlocks cl
+    __fish_zypper_cmd_in_array cleanlocks cl
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-duplicates -s d -d 'Clean only duplicate locks'
-complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty -s e      -d "Clean only locks which doesn't lock anything"
+complete -c zypper -n '__fish_zypper_is_subcommand_cl' -l only-empty -s e -d "Clean only locks which doesn't lock anything"
 
 function __fish_zypper_is_subcommand_vcmp
-        __fish_zypper_cmd_in_array versioncmp vcmp
+    __fish_zypper_cmd_in_array versioncmp vcmp
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_vcmp' -l match -s m -d 'Takes missing release number as any release'
 
 function __fish_zypper_is_subcommand_tos
-        __fish_zypper_cmd_in_array targetos tos
+    __fish_zypper_cmd_in_array targetos tos
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_tos' -l label -s l -d 'Show the operating system label'
 
 function __fish_zypper_is_subcommand_clean
-        __fish_zypper_cmd_in_array clean
+    __fish_zypper_cmd_in_array clean
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l repo -s r -r -a "(__fish_zypper_print_repos)" -d 'Clean only specified repositories'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata -s m     -d 'Clean metadata cache'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l metadata -s m -d 'Clean metadata cache'
 complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l raw-metadata -s M -d 'Clean raw metadata cache'
-complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all -s a          -d 'Clean both metadata and package caches'
+complete -c zypper -n '__fish_zypper_is_subcommand_clean' -l all -s a -d 'Clean both metadata and package caches'
 
 function __fish_zypper_is_subcommand_patch
-        __fish_zypper_cmd_in_array patch
+    __fish_zypper_cmd_in_array patch
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l auto-agree-with-licenses -s l -d "Automatically say 'yes' to third party license confirmation prompt"
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla -s b                 -d 'Install patch fixing the specified bugzilla issue'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g                 -d 'Install all patches in this category'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l bugzilla -s b -d 'Install patch fixing the specified bugzilla issue'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l category -s g -d 'Install all patches in this category'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l repo -s r -r -a "(__fish_zypper_print_repos -e)" -d 'Load only the specified repository'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run -s D                  -d 'Test the update, do not actually update'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d            -d 'Only download the packages, do not install'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve                           -d 'Install patch fixing the specified CVE issue'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date                          -d 'Install patches issued until the specified date <YYYY-MM-DD>'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l debug-solver                  -d 'Create solver test case for debugging'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-recommends                 -d 'Do not install recommended packages, only required'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l recommends                    -d 'Install also recommended packages in addition to the required'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l dry-run -s D -d 'Test the update, do not actually update'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download-only -s d -d 'Only download the packages, do not install'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l cve -d 'Install patch fixing the specified CVE issue'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l date -d 'Install patches issued until the specified date <YYYY-MM-DD>'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l debug-solver -d 'Create solver test case for debugging'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l no-recommends -d 'Do not install recommended packages, only required'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l recommends -d 'Install also recommended packages in addition to the required'
 complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l download -f -r -a "$__fish_zypper_download_modes" -d 'Set the download-install mode'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive              -d 'Skip interactive patches'
-complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive              -d 'Do not skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l skip-interactive -d 'Skip interactive patches'
+complete -c zypper -n '__fish_zypper_is_subcommand_patch' -l with-interactive -d 'Do not skip interactive patches'
 
 function __fish_zypper_is_subcommand_sourcedownload
-        __fish_zypper_cmd_in_array source-download
+    __fish_zypper_cmd_in_array source-download
 end
 
 complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l directory -s d -d 'Download all source rpms to this directory. Default: /var/cache/zypper/source-download'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete         -d 'Delete extraneous source rpms in the local directory'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete      -d 'Do not delete extraneous source rpms'
-complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status         -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l delete -d 'Delete extraneous source rpms in the local directory'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l no-delete -d 'Do not delete extraneous source rpms'
+complete -c zypper -n '__fish_zypper_is_subcommand_sourcedownload' -l status -d "Don't download any source rpms, but show which source rpms are missing or extraneous"
diff --git a/share/functions/fish_vi_cursor.fish b/share/functions/fish_vi_cursor.fish
index 27d2474f3..3c1d8b2ca 100644
--- a/share/functions/fish_vi_cursor.fish
+++ b/share/functions/fish_vi_cursor.fish
@@ -32,7 +32,9 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
     # We use the `tput` here just to see if terminfo thinks we can change the cursor.
     # We cannot use that sequence directly as it's not the correct one for konsole and iTerm,
     # and because we may want to change the cursor even though terminfo says we can't (tmux).
-    if begin; not command -sq tput; or not tput Ss >/dev/null 2>/dev/null; end
+    if begin
+            not command -sq tput; or not tput Ss >/dev/null 2>/dev/null
+        end
         # Whitelist tmux...
         and not begin
             set -q TMUX