diff --git a/share/completions/burp.fish b/share/completions/burp.fish
new file mode 100644
index 000000000..c2997230e
--- /dev/null
+++ b/share/completions/burp.fish
@@ -0,0 +1,11 @@
+#
+# Command specific completions for the burp command.
+# SanskritFritz (gmail)
+#
+
+complete -c burp -s u -l user --description 'AUR login username'
+complete -c burp -s p -l password --description 'AUR login password'
+complete -c burp -s c -l category --description 'Specify CATEGORY for the package'
+complete -c burp -s C -l cookies --description 'The path in which to store cookies'
+complete -c burp -s k -l keep-cookies --description 'Cookies will be persistent'
+complete -c burp -s v -l verbose --description 'Be more verbose'
diff --git a/share/completions/cower.fish b/share/completions/cower.fish
index dd69934c4..ecc9bea1e 100644
--- a/share/completions/cower.fish
+++ b/share/completions/cower.fish
@@ -15,7 +15,6 @@ complete -c cower -f -s h -l 'help'             -d 'Display help and quit'
 complete -c cower -f      -l 'ignore' -xa "(pacman -Qq)" -d 'Ignore a package upgrade'
 complete -c cower -f      -l 'ignorerepo' -xa "(cat /etc/pacman.conf | grep '^\[.\+\]' | sed 's/[]\[]//g')" -d 'Ignore a binary repo when checking for updates'
 complete -c cower -f      -l 'listdelim'        -d 'Specify a delimiter for list formatters'
-complete -c cower -f      -l 'nossl'            -d 'No secure http connections to the AUR'
 complete -c cower -f -s q -l 'quiet'            -d 'Output less'
 complete -c cower -f -s t -l 'target'           -d 'Download targets to DIR'
 complete -c cower -f      -l 'threads'          -d 'Limit the number of threads created [10]'
diff --git a/share/completions/cp.fish b/share/completions/cp.fish
index 0415bd866..8b1615852 100644
--- a/share/completions/cp.fish
+++ b/share/completions/cp.fish
@@ -1,3 +1,6 @@
+# Completions for cp
+# SanskritFritz (gmail)
+
 complete -c cp -s a -l archive --description "Same as -dpR"
 complete -c cp -s b -l backup --description "Make backup of each existing destination file" -a "none off numbered t existing nil simple never"
 complete -c cp -l copy-contents --description "Copy contents of special files when recursive"
@@ -16,12 +19,12 @@ complete -c cp -l version --description "Display version and exit"
 complete -c cp -s L -l dereference --description "Always follow symbolic links"
 complete -c cp -s P -l no-dereference --description "Never follow symbolic links"
 complete -c cp -s p  --description "Same as --preserve=mode,ownership,timestamps"
-complete -c cp -l preserve --description "Preserve the specified attributes and security contexts, if possible" -a "mode ownership timestamps links all"
-complete -c cp -l no-preserve -r --description "Don't preserve the specified attributes" -a "mode ownership timestamps links all"
+complete -c cp -f -l preserve --description "Preserve ATTRIBUTES if possible" -xa "mode ownership timestamps links all"
+complete -c cp -f -l no-preserve -r --description "Don't preserve ATTRIBUTES" -xa "mode ownership timestamps links all"
 complete -c cp -l parents --description "Use full source file name under DIRECTORY"
 complete -c cp -s r -s R -l recursive --description "Copy directories recursively"
-complete -c cp -l remove-destination --description "Remove each existing destination file before attempting to open it (contrast with --force)"
-complete -c cp -l sparse -r --description "Control creation of sparse files" -a "always auto never"
+complete -c cp -l remove-destination --description "First remove existing destination files"
+complete -c cp -f -l sparse -r --description "Control creation of sparse files" -xa "always auto never"
 complete -c cp -s s -l symbolic-link --description "Make symbolic links instead of copying"
 complete -c cp -s T -l no-target-directory --description "Treat DEST as a normal file"
 complete -c cp -s x -l one-file-system --description "Stay on this file system"
diff --git a/share/completions/encfs.fish b/share/completions/encfs.fish
new file mode 100644
index 000000000..6034f42f3
--- /dev/null
+++ b/share/completions/encfs.fish
@@ -0,0 +1,18 @@
+# Completions for encfs
+# SanskritFritz (gmail)
+
+complete -c encfs -s i -l idle -d "Unmount when idle for specified MINUTES"
+complete -c encfs -s f -d "Run in the foreground"
+complete -c encfs -s v -l verbose -d "Verbose messages when run foreground"
+complete -c encfs -s s -d "Run in single threaded mode"
+complete -c encfs -s d -l fuse-debug -d "Enables debugging within the FUSE library"
+complete -c encfs -l forcedecode -d "Return data even from corrupted files"
+complete -c encfs -l public -d "Make files public to all other users"
+complete -c encfs -l ondemand -d "Mount the filesystem on-demand"
+complete -c encfs -l reverse -d "Produce encrypted view of plain files"
+complete -c encfs -l standard -d "Use standard options when creating filesystem"
+complete -c encfs -s o -d "Pass on options to FUSE"
+complete -c encfs -l no-default-flags -d "Don't use the default FUSE flags"
+complete -c encfs -l extpass -d "Get password from an external program"
+complete -c encfs -s S -l stdinpass -d "Read password from standard input"
+complete -c encfs -l anykey -d "Turn off key validation checking"
diff --git a/share/completions/fcrontab.fish b/share/completions/fcrontab.fish
new file mode 100644
index 000000000..fa7fb3144
--- /dev/null
+++ b/share/completions/fcrontab.fish
@@ -0,0 +1,17 @@
+#
+# Command specific completions for the fcrontab command.
+# These completions where generated from the commands
+# man page by the make_completions.py script, but may
+# have been hand edited since.
+#
+
+complete -c fcrontab -s u --description 'User Specify the user whose fcrontab will be managed, or "systab" for the system fcrontab'
+complete -c fcrontab -s l --description 'List user\'s current fcrontab to standard output'
+complete -c fcrontab -s e --description 'Edit user\'s current fcrontab using either the editor specified by the environment variable VIS‐ UAL, or EDITOR if VISUAL is not set'
+complete -c fcrontab -s r --description 'Remove user\'s fcrontab'
+complete -c fcrontab -s z --description 'Reinstall user\'s fcrontab from its source code'
+complete -c fcrontab -s n --description 'Ignore previous version'
+complete -c fcrontab -s c --description 'File Make fcrontab use config file file instead of default config file /usr/local/etc/fcron'
+complete -c fcrontab -s d --description 'Run in debug mode'
+complete -c fcrontab -s h --description 'Display a brief description of the options'
+complete -c fcrontab -s V --description 'Display an informational message about fcrontab, including its version and the license under which it is distributed'
diff --git a/share/completions/journalctl.fish b/share/completions/journalctl.fish
new file mode 100644
index 000000000..e00815070
--- /dev/null
+++ b/share/completions/journalctl.fish
@@ -0,0 +1,32 @@
+# Completions for journalctl
+# Author: SanskritFritz (gmail)
+
+set -l all_units '(systemctl list-unit-files --no-pager --no-legend | while read -l unit_name unit_state; echo -e $unit_name\t$unit_state;end | sed "s/ //g")'
+
+complete -c journalctl -f -s h -l help -d 'Prints a short help text and exits'
+complete -c journalctl -f      -l version -d 'Prints a short version string and exits'
+complete -c journalctl -f      -l no-pager -d 'Do not pipe output into a pager'
+complete -c journalctl -f -s a -l all -d 'Show all fields in full'
+complete -c journalctl -f -s f -l follow -d 'Show live tail of entries'
+complete -c journalctl -f -s n -l lines -d 'Controls the number of journal lines'
+complete -c journalctl -f      -l no-tail -d 'Show all lines, even in follow mode'
+complete -c journalctl -f -s o -l output -d 'Controls the formatting' -xa 'short short-monotonic verbose export json json-pretty json-sse cat'
+complete -c journalctl -f -s q -l quiet -d 'Suppress warning about normal user'
+complete -c journalctl -f -s m -l merge -d 'Show entries interleaved from all journals'
+complete -c journalctl -f -s b -l this-boot -d 'Show data only from current boot'
+complete -c journalctl -f -s u -l unit -d 'Show data only of the specified unit' -xa "$all_units"
+complete -c journalctl -f -s p -l priority -d 'Filter by priority' -xa 'emerg 0 alert 1 crit 2 err 3 warning 4 notice 5 info 6 debug 7'
+complete -c journalctl -f -s c -l cursor -d 'Start from the passing cursor'
+complete -c journalctl -f      -l since -d 'Entries on or newer than DATE' -xa 'yesterday today tomorrow now'
+complete -c journalctl -f      -l until -d 'Entries on or older than DATE' -xa 'yesterday today tomorrow now'
+complete -c journalctl -f -s F -l field -d 'Print all possible data values'
+complete -c journalctl -f -s D -l directory -d 'Specify journal directory' -xa "(__fish_complete_directories (commandline -ct) 'Directory')"
+complete -c journalctl -f      -l new-id128 -d 'Generate a new 128 bit ID'
+complete -c journalctl -f      -l header -d 'Show internal header information'
+complete -c journalctl -f      -l disk-usage -d 'Shows the current disk usage'
+complete -c journalctl -f      -l setup-keys -d 'Generate Forward Secure Sealing key pair'
+complete -c journalctl -f      -l interval -d 'Change interval for the sealing'
+complete -c journalctl -f      -l verify -d 'Check journal for internal consistency'
+complete -c journalctl -f      -l verify-key -d 'Specifies FSS key for --verify'
+ctl -f      -l verify -d 'Check journal for internal consistency'
+complete -c journalctl -f      -l verify-key -d 'Specifies FSS key for --verify'
diff --git a/share/completions/meat.fish b/share/completions/meat.fish
new file mode 100644
index 000000000..09964fe7f
--- /dev/null
+++ b/share/completions/meat.fish
@@ -0,0 +1,42 @@
+# Command specific completions for meat (an Archlinux AUR helper).
+# Written by SanskritFritz (gmail)
+
+set -l listinstalled "(pacman -Qm | tr ' ' \t)"
+set -l listall       "(pacman -Sl | cut --delim ' ' --fields 2- | tr ' ' \t)"
+set -l listrepos    "(cat /etc/pacman.conf | grep '^\[.\+\]' | sed 's/[]\[]//g')"
+set -l listgroups    "(pacman -Sg | sed 's/\(.*\)/\1\tPackage group/g')"
+
+
+# Operations:
+complete -c meat -f -s h -l 'help'             -d 'Display help and quit'
+complete -c meat -f -s d -l 'download'         -d 'Download and install targets'
+complete -c meat -f -s G -l 'git-db-update'    -d 'Update the git database'
+complete -c meat -f -s i -l 'info'             -d 'Show info for target [twice for more details]'
+complete -c meat -f -s s -l 'search'           -d 'Search for packages by name'
+complete -c meat -f -s m -l 'msearch'          -d 'Search for packages by maintainer'
+complete -c meat -f -s u -l 'update'           -d 'Check for updates and install'
+complete -c meat -f -s U -l 'listupdates'      -d 'Check for updates and list them'
+
+# General options:
+complete -c meat -f -s f -l 'force'            -d 'Continue no matter what [not recommended]'
+complete -c meat -f -s g -l 'git-check'        -d 'Update checksums for git files'
+complete -c meat -f      -l 'ignoregit' -xa "$listinstalled" -d 'Ignore PKG when checking for git updates'
+complete -c meat -f      -l 'ignore' -xa "$listinstalled" -d 'Ignore PKG upgrade'
+complete -c meat -f      -l 'ignorerepo' -xa "$listrepos" -d 'Ignore REPO when checking for updates'
+complete -c meat -f      -l 'nossl'            -d "Don't use https connections"
+complete -c meat -f      -l 'sign'             -d "GPG sign the resulting package"
+complete -c meat -f      -l 'nosign'           -d "Don't GPG sign the resulting package"
+complete -c meat -f -s t -l 'target'           -d 'Download targets to DIR'
+complete -c meat -f      -l 'threads'          -d 'Limit the number of threads created [10]'
+complete -c meat -f      -l 'timeout'          -d 'Curl timeout in seconds'
+complete -c meat -f      -l 'check-all'        -d 'Check all files when installing'
+
+# Output options:
+complete -c meat -f -s c -l 'color' -a 'always auto never' -d 'Use colored output'
+complete -c meat -f      -l 'debug'            -d 'Show debug output'
+complete -c meat -f      -l 'format'           -d 'Print formatted'
+complete -c meat -f -s q -l 'quiet'            -d 'Output less'
+complete -c meat -f -s v -l 'verbose'          -d 'Output more'
+
+# Complete with AUR packages:
+complete -c meat -f --condition 'not expr (commandline --current-token) : "^-.*" > /dev/null' --arguments '(cower --format="%n\n" --search (commandline --current-token))'
diff --git a/share/completions/native2ascii.fish b/share/completions/native2ascii.fish
new file mode 100644
index 000000000..0ecac331b
--- /dev/null
+++ b/share/completions/native2ascii.fish
@@ -0,0 +1,4 @@
+# native2ascii
+complete -c native2ascii -o reverse --description 'Perform the reverse operation'
+complete -c native2ascii -o encoding --description 'Specifies the name of the character encoding'
+complete -c native2ascii -o Joption --description 'Pass "option" to JVM'
diff --git a/share/completions/obnam.fish b/share/completions/obnam.fish
new file mode 100644
index 000000000..87e615e3c
--- /dev/null
+++ b/share/completions/obnam.fish
@@ -0,0 +1,119 @@
+# Completions for obnam
+# Author: SanskritFritz (gmail)
+
+set -l nocommand 'commandline | not sgrep -qe "add-key\|backup\|client-keys\|clients\|diff\|dump-repo\|force-lock\|forget\|fsck\|generations\|genids\|list-keys\|list-toplevels\|ls\|mount\|nagios-last-backup-age\|remove-client\|remove-key\|restore\|verify"'
+
+complete --command obnam --no-files --condition $nocommand --arguments 'add-key' --description 'Adds an encryption key to the repository'
+complete --command obnam            --condition $nocommand --arguments 'backup' --description 'Makes a new backup'
+complete --command obnam --no-files --condition $nocommand --arguments 'client-keys' --description 'Lists the keys associated with each client'
+complete --command obnam --no-files --condition $nocommand --arguments 'clients' --description 'Lists the clients in the repository'
+complete --command obnam --no-files --condition $nocommand --arguments 'diff' --description 'Compares two generations'
+complete --command obnam --no-files --condition $nocommand --arguments 'dump-repo' --description 'Dumps the repository'
+complete --command obnam --no-files --condition $nocommand --arguments 'force-lock' --description 'Removes a lock file for a client'
+complete --command obnam --no-files --condition $nocommand --arguments 'forget' --description 'Removes backup generations'
+complete --command obnam --no-files --condition $nocommand --arguments 'fsck' --description 'Checks the consistency of the repository'
+complete --command obnam --no-files --condition $nocommand --arguments 'generations' --description 'Lists every backup generation'
+complete --command obnam --no-files --condition $nocommand --arguments 'genids' --description 'Lists the identifier for every generation'
+complete --command obnam --no-files --condition $nocommand --arguments 'list-keys' --description 'Lists the keys'
+complete --command obnam --no-files --condition $nocommand --arguments 'list-toplevels' --description 'Lists the toplevel keys'
+complete --command obnam --no-files --condition $nocommand --arguments 'ls' --description 'Lists the contents of a given generation'
+complete --command obnam --no-files --condition $nocommand --arguments 'mount' --description 'Makes the repository available via FUSE'
+complete --command obnam --no-files --condition $nocommand --arguments 'nagios-last-backup-age' --description 'Check if a backup age exceeds a threshold'
+complete --command obnam --no-files --condition $nocommand --arguments 'remove-client' --description 'Removes a client from the repository'
+complete --command obnam --no-files --condition $nocommand --arguments 'remove-key' --description 'Removes a key from the repository'
+complete --command obnam --no-files --condition $nocommand --arguments 'restore' --description 'Restore files from the repository'
+complete --command obnam --no-files --condition $nocommand --arguments 'verify' --description 'Verifies files in the repository'
+
+complete --command obnam --no-files --long-option always-restore-setuid --description 'Restore setuid/setgid bits in restored files'
+complete --command obnam --no-files --long-option no-always-restore-setuid --description 'Do not restore setuid/setgid bits in restored files'
+complete --command obnam --no-files --long-option client-name --arguments '(hostname)' --description 'Name of client'
+complete --command obnam --no-files --long-option compress-with --arguments 'none deflate' --description 'Compress repository with'
+complete --command obnam --no-files --long-option critical-age --description 'For --nagios-last-backup-age: maximum age'
+complete --command obnam --no-files --long-option dump-repo-file-metadata --description 'Dump metadata about files'
+complete --command obnam --no-files --long-option no-dump-repo-file-metadata --description 'Do not dump metadata about files'
+complete --command obnam --no-files --long-option generate-manpage --description 'Generate man page'
+complete --command obnam --no-files --long-option generation --description 'Which generation to restore'
+complete --command obnam --no-files --short-option h --long-option help --description 'Show this help message and exit'
+complete --command obnam --no-files --long-option keep --description 'Policy for what generations to keep when forgetting.'
+complete --command obnam --no-files --long-option lock-timeout --description 'Wait TIMEOUT seconds for an existing lock'
+complete --command obnam --long-option output --description 'Write output to FILE instead of STDOUT'
+complete --command obnam --no-files --long-option pretend --long-option dry-run --long-option no-act --description 'Do not actually change anything'
+complete --command obnam --no-files --long-option no-pretend --long-option no-dry-run --long-option no-no-act --description 'Actually commit changes'
+complete --command obnam --no-files --long-option quiet --description 'Show only errors, no progress updates'
+complete --command obnam --no-files --long-option no-quiet --description 'Show errors and progress updates'
+complete --command obnam --short-option r --long-option repository --description 'Name of backup repository'
+complete --command obnam --long-option root --description 'What to backup'
+complete --command obnam --no-files --long-option testing-fail-matching --description 'Simulate failures for files that match REGEXP'
+complete --command obnam --long-option to --description 'Where to restore / mount to'
+complete --command obnam --long-option trace --description 'FILENAME pattern for trace debugging'
+complete --command obnam --no-files --long-option verbose --description 'Be more verbose'
+complete --command obnam --no-files --long-option no-verbose --description 'Do not be verbose'
+complete --command obnam --no-files --long-option verify-randomly --description 'Verify N files randomly from the backup'
+complete --command obnam --no-files --long-option version --description 'Show version number and exit'
+complete --command obnam --long-option warn-age --description 'For nagios-last-backup-age: maximum age'
+complete --command obnam --no-files --long-option checkpoint --description 'Make a checkpoint after a given SIZE'
+complete --command obnam --no-files --long-option deduplicate --arguments 'fatalist never verify' --description 'Deduplicate mode'
+complete --command obnam --long-option exclude --description 'REGEXP for pathnames to exclude'
+complete --command obnam --no-files --long-option exclude-caches --description 'Exclude directories tagged as cache'
+complete --command obnam --no-files --long-option no-exclude-caches --description 'Include directories tagged as cache'
+complete --command obnam --long-option exclude-from --description 'Read exclude patterns from FILE.'
+complete --command obnam --no-files --long-option leave-checkpoints --description 'Leave checkpoint generations at the end of backup'
+complete --command obnam --no-files --long-option no-leave-checkpoints --description 'Omit checkpoint generations at the end of backup'
+complete --command obnam --no-files --long-option one-file-system --description 'Do not follow mount points'
+complete --command obnam --no-files --long-option no-one-file-system --description 'Follow mount points'
+complete --command obnam --no-files --long-option small-files-in-btree --description 'Put small files directly into the B-tree'
+complete --command obnam --no-files --long-option no-small-files-in-btree --description 'No not put small files into the B-tree'
+complete --command obnam --long-option config --description 'Add FILE to config files'
+complete --command obnam --no-files --long-option dump-config --description 'Write out the current configuration'
+complete --command obnam --no-files --long-option dump-setting-names --description 'Write out setting names'
+complete --command obnam --no-files --long-option help-all --description 'Show all options'
+complete --command obnam --no-files --long-option list-config-files --description 'List config files'
+complete --command obnam --no-files --long-option no-default-configs --description 'Clear list of configuration files to read'
+complete --command obnam --no-files --long-option encrypt-with --description 'PGP key with which to encrypt'
+complete --command obnam --no-files --long-option key-details --description 'Show additional user IDs'
+complete --command obnam --no-files --long-option no-key-details --description 'Do not show additional user IDs'
+complete --command obnam --no-files --long-option keyid --description 'PGP key id'
+complete --command obnam --no-files --long-option symmetric-key-bits --description 'Size of symmetric key'
+complete --command obnam --no-files --long-option weak-random --description 'Use /dev/urandom instead of /dev/random'
+complete --command obnam --no-files --long-option no-weak-random --description 'Use default /dev/random'
+
+complete --command obnam --no-files --long-option fsck-fix --description 'fsck should try to fix problems'
+complete --command obnam --no-files --long-option no-fsck-fix --description 'fsck should not try to fix problems'
+complete --command obnam --no-files --long-option fsck-ignore-chunks --description 'Ignore chunks when checking integrity'
+complete --command obnam --no-files --long-option no-fsck-ignore-chunks --description 'Check chunks when checking integrity'
+complete --command obnam --no-files --long-option fsck-ignore-client --description 'Do not check data for cient NAME.'
+complete --command obnam --no-files --long-option fsck-last-generation-only --description 'Check only the last generation'
+complete --command obnam --no-files --long-option no-fsck-last-generation-only --description 'Check all generations'
+complete --command obnam --no-files --long-option fsck-skip-dirs --description 'Do not check directories'
+complete --command obnam --no-files --long-option no-fsck-skip-dirs --description 'Check directories'
+complete --command obnam --no-files --long-option fsck-skip-files --description 'Do not check files'
+complete --command obnam --no-files --long-option no-fsck-skip-files --description 'Check files'
+complete --command obnam --no-files --long-option fsck-skip-generations --description 'Do not check any generations'
+complete --command obnam --no-files --long-option no-fsck-skip-generations --description 'Check all generations'
+complete --command obnam --no-files --long-option fsck-skip-per-client-b-trees --description 'Do not check per-client B-trees'
+complete --command obnam --no-files --long-option no-fsck-skip-per-client-b-trees --description 'Check per-client B-trees'
+complete --command obnam --no-files --long-option fsck-skip-shared-b-trees --description 'Do not check shared B-trees'
+complete --command obnam --no-files --long-option no-fsck-skip-shared-b-trees --description 'Check shared B-trees'
+
+complete --command obnam --long-option log --arguments 'syslog' --description 'Write log to FILE or syslog'
+complete --command obnam --no-files --long-option log-keep --description 'Keep last N logs (10)'
+complete --command obnam --no-files --long-option log-level --arguments 'debug info warning error critical fatal' --description 'Log at LEVEL'
+complete --command obnam --no-files --long-option log-max --description 'Rotate logs larger than SIZE'
+complete --command obnam --no-files --long-option log-mode --description 'Set permissions of logfiles to MODE'
+complete --command obnam --no-files --long-option fuse-opt --description 'Options to pass to FUSE'
+complete --command obnam --no-files --long-option dump-memory-profile --arguments 'none simple meliae heapy' --description 'Make memory profiling dumps using METHOD'
+complete --command obnam --no-files --long-option memory-dump-interval --description 'Make memory profiling dumps at SECONDS'
+complete --command obnam --no-files --long-option chunk-size --description 'Size of chunks of file data'
+complete --command obnam --no-files --long-option chunkids-per-group --description 'Encode NUM chunk ids per group'
+complete --command obnam --no-files --long-option idpath-bits --description 'Chunk id level size'
+complete --command obnam --no-files --long-option idpath-depth --description 'Depth of chunk id mapping'
+complete --command obnam --no-files --long-option idpath-skip --description 'Chunk id mapping lowest bits skip'
+complete --command obnam --no-files --long-option lru-size --description 'Size of LRU cache for B-tree nodes'
+complete --command obnam --no-files --long-option node-size --description 'Size of B-tree nodes on disk'
+complete --command obnam --no-files --long-option upload-queue-size --description 'Length of upload queue for B-tree nodes'
+complete --command obnam --no-files --long-option pure-paramiko --description 'Use only paramiko, no openssh'
+complete --command obnam --no-files --long-option no-pure-paramiko --description 'Use openssh if available'
+complete --command obnam --long-option ssh-command --description 'Executable to be used instead of "ssh"'
+complete --command obnam --no-files --long-option ssh-host-keys-check --arguments 'no yes ask ssh-config' --description 'ssh host key check'
+complete --command obnam --long-option ssh-key --description 'Use FILENAME as the ssh RSA key'
+complete --command obnam --long-option ssh-known-hosts --arguments '~/.ssh/known_hosts' --description 'FILENAME of the known_hosts file'
diff --git a/share/completions/pdftotext.fish b/share/completions/pdftotext.fish
new file mode 100644
index 000000000..f7ae42869
--- /dev/null
+++ b/share/completions/pdftotext.fish
@@ -0,0 +1,24 @@
+# Completions for pdftotext
+# Author: SanskritFritz (gmail)
+
+complete -c pdftotext -s f -d "First page to convert"
+complete -c pdftotext -s l -d "Last page to convert"
+complete -c pdftotext -s r -d "Resolution, in DPI [75]"
+complete -c pdftotext -s x -d "Top left X-coordinate of crop area"
+complete -c pdftotext -s y -d "Top left y-coordinate of crop area"
+complete -c pdftotext -s W -d "Width of crop area in pixels"
+complete -c pdftotext -s H -d "Height of crop area in pixels"
+complete -c pdftotext -o layout -d "Maintain original layout"
+complete -c pdftotext -o fixed -d "Assume fixed-pitch/tabular text"
+complete -c pdftotext -o raw -d "Keep text in content stream order"
+complete -c pdftotext -o htmlmeta -d "Generate simple HTML file"
+complete -c pdftotext -o bbox -d "Generate XHTML bounding boxes"
+complete -c pdftotext -o enc -d "Sets encoding for the output [UTF-8]"
+complete -c pdftotext -o listenc -d "Lists the available encodings"
+complete -c pdftotext -o eol -d "Sets the end-of-line convention" -xa 'unix dos mac'
+complete -c pdftotext -o nopgbrk -d "Don't insert page breaks"
+complete -c pdftotext -o opw -d "Specify owner password for the PDF"
+complete -c pdftotext -o upw -d "Specify user password for the PDF"
+complete -c pdftotext -s q -d "Don't print any messages or errors"
+complete -c pdftotext -s v -d "Print copyright and version"
+complete -c pdftotext -s h -d "Print usage information"
diff --git a/share/completions/scrot.fish b/share/completions/scrot.fish
index 5cd03e902..e09d5c013 100644
--- a/share/completions/scrot.fish
+++ b/share/completions/scrot.fish
@@ -1,11 +1,14 @@
+# Command specific completions for the scrot command.
+# Author: SanskritFritz (gmail)
+
+complete -c scrot -s h -l help --description 'Display help and exit'
+complete -c scrot -s v -l version --description 'Display version information and exit'
+complete -c scrot -s b -l border --description 'When selecting a window, grab wm border too'
+complete -c scrot -s c -l count --description 'Display a countdown when used with delay'
+complete -c scrot -s d -l delay --description 'Wait NUMBER of seconds before taking a shot'
+complete -c scrot -s e -l exec --description 'Execute APPLICATION on the saved image'
+complete -c scrot -s q -l quality --description 'Image quality [1-100]'
+complete -c scrot -s m -l multidisp --description 'Grab shot from multiple heads'
+complete -c scrot -s s -l select --description 'Select a window or rectangle with the mouse'
+complete -c scrot -s t -l thumb --description 'Generate thumbnail PERCENT of original'
 
-complete -c scrot -s h -l help        -d 'display this help and exit'
-complete -c scrot -s v -l version     -d 'output version information and exit'
-complete -c scrot -s b -l border      -d 'When selecting a window, grab wm border too'
-complete -c scrot -s c -l count       -d 'show a countdown before taking the shot'
-complete -c scrot -s d -l delay -x    -d 'wait NUM seconds before taking a shot'
-complete -c scrot -s e -l exec        -d 'run APP on the resulting screenshot' -xa '(complete -C(commandline -ct))'
-complete -c scrot -s q -l quality -x  -d 'Image quality (1-100) high value means high size, low compression. Default: 75.  For lossless compression formats, like png, low quality means high compression.'
-complete -c scrot -s m -l multidisp   -d 'For multiple heads, grab shot from each and join them together.'
-complete -c scrot -s s -l select      -d 'interactively choose a window or rectangle with the mouse'
-complete -c scrot -s t -l thumb -x    -d 'generate thumbnail too. NUM is the percentage of the original size for the thumbnail to be, or the geometry in percent, e.g. 50x60 or 80x20.'
diff --git a/share/completions/set.fish b/share/completions/set.fish
index 6db28053b..cadbec0f1 100644
--- a/share/completions/set.fish
+++ b/share/completions/set.fish
@@ -60,7 +60,7 @@ complete -c set -n '__fish_is_first_token' -s x -l export --description "Export
 complete -c set -n '__fish_is_first_token' -s u -l unexport --description "Do not export variable to subprocess"
 complete -c set -n '__fish_is_first_token' -s g -l global --description "Make variable scope global"
 complete -c set -n '__fish_is_first_token' -s l -l local --description "Make variable scope local"
-complete -c set -n '__fish_is_first_token' -s U -l universal --description "Make variable scope universal, i.e. share variable with all the users fish processes on this computer"
+complete -c set -n '__fish_is_first_token' -s U -l universal --description "Share variable persistently across sessions"
 complete -c set -n '__fish_is_first_token' -s q -l query --description "Test if variable is defined"
 complete -c set -n '__fish_is_first_token' -s h -l help --description "Display help and exit"
 complete -c set -n '__fish_is_first_token' -s n -l names --description "List the names of the variables, but not their value"
diff --git a/share/completions/sort.fish b/share/completions/sort.fish
index 13ac6aed6..a9f665ae8 100644
--- a/share/completions/sort.fish
+++ b/share/completions/sort.fish
@@ -1,10 +1,16 @@
+# Completions for sort
+# SanskritFritz (gmail)
+
 complete -c sort -s b -l ignore-leading-blanks --description "Ignore leading blanks"
 complete -c sort -s d -l dictionary-order --description "Consider only blanks and alphanumerics"
 complete -c sort -s f -l ignore-case --description "Ignore case"
 complete -c sort -s g -l general-numeric-sort --description "Compare general numeric value"
 complete -c sort -s i -l ignore-nonprinting --description "Consider only printable"
+complete -c sort -s h -l human-numeric-sort --description "Compare human readable numbers [2K 1G]"
 complete -c sort -s M -l month-sort --description "Compare month names"
 complete -c sort -s n -l numeric-sort --description "Compare string numerical value"
+complete -c sort -s R -l random-sort --description "Sort by random hash of keys"
+complete -c sort      -l random-source --description "Get random bytes from FILE"
 complete -c sort -s r -l reverse --description "Reverse results"
 complete -c sort -s c -l check --description "Only check if sorted"
 complete -c sort -s k -l key --description "Define key"
diff --git a/share/completions/transmission-remote.fish b/share/completions/transmission-remote.fish
new file mode 100644
index 000000000..a5c662e17
--- /dev/null
+++ b/share/completions/transmission-remote.fish
@@ -0,0 +1,81 @@
+# Fish shell completions for transmission-remote
+# Written by SanskritFritz (gmail)
+
+complete -c transmission-remote -s a -l add --description 'Add torrents to transmission'
+complete -c transmission-remote -s b -l debug --description 'Enable debugging mode'
+complete -c transmission-remote -o as -l alt-speed --description 'Use the alternate Limits'
+complete -c transmission-remote -o AS -l no-alt-speed --description 'Don\'t use the alternate Limits'
+complete -c transmission-remote -o asd -l alt-speed-downlimit --description 'Limit the alternate download speed'
+complete -c transmission-remote -o asu -l alt-speed-uplimit --description 'Limit the alternate upload speed'
+complete -c transmission-remote -o asc -l alt-speed-scheduler --description 'Use the scheduled on/off times'
+complete -c transmission-remote -o ASC -l no-alt-speed-scheduler --description 'Don\'t use the scheduled on/off times'
+complete -c transmission-remote -l alt-speed-time-begin --description 'Time to start using the alt speed limits (in)'
+complete -c transmission-remote -l alt-speed-time-end --description 'Time to stop using the alt speed limits (hhmm)'
+complete -c transmission-remote -l alt-speed-days --description 'Number of days to enable the speed scheduler'
+complete -c transmission-remote -l torrent-done-script --description 'Script to run each time a torrent finishes'
+complete -c transmission-remote -l no-torrent-done-script --description 'Don\'t run any script when a torrent finishes'
+complete -c transmission-remote -s c -l incomplete-dir --description 'Directory for incomplete downloads'
+complete -c transmission-remote -s C -l no-incomplete-dir --description 'Don\'t store incomplete torrents in a different directory'
+complete -c transmission-remote -s d -l downlimit --description 'Limit the maximum download speed to limit'
+complete -c transmission-remote -s D -l no-downlimit --description 'Disable download speed limits'
+complete -c transmission-remote -s e -l cache --description 'Set the session\'s maximum memory cache size (MiB)'
+complete -c transmission-remote -o er -l encryption-required --description 'Encrypt all peer connections'
+complete -c transmission-remote -o ep -l encryption-preferred --description 'Prefer encrypted peer connections'
+complete -c transmission-remote -o et -l encryption-tolerated --description 'Prefer unencrypted peer connections'
+complete -c transmission-remote -l exit --description 'Tell the Transmission to initiate a shutdown'
+complete -c transmission-remote -s f -l files --description 'Get a file list for the current torrent(s)'
+complete -c transmission-remote -s g -l get --description 'Mark file(s) for download'
+complete -c transmission-remote -s G -l no-get --description 'Mark file(s) for not downloading'
+complete -c transmission-remote -o gsr -l global-seedratio --description 'Ratio All torrents should seed'
+complete -c transmission-remote -o GSR -l no-global-seedratio --description 'All torrents should seed regardless of ratio'
+complete -c transmission-remote -s h -l help --description 'Print command-line option descriptions'
+complete -c transmission-remote -s i -l info --description 'Show details of the current torrent(s)'
+complete -c transmission-remote -o si -l session-info --description 'List session information from the server'
+complete -c transmission-remote -o st -l session-stats --description 'List statistical information from the server'
+complete -c transmission-remote -s l -l list --description 'List all torrents'
+complete -c transmission-remote -s m -l portmap --description 'Enable portmapping via NAT-PMP or UPnP'
+complete -c transmission-remote -s M -l no-portmap --description 'Disable portmapping'
+complete -c transmission-remote -s n -l auth --description 'Set the username:password for authentication'
+complete -c transmission-remote -o ne -l authenv --description 'Set the authentication information from $TR_AUTH'
+complete -c transmission-remote -s N -l netrc --description 'Set authentication information from a netrc file'
+complete -c transmission-remote -s o -l dht --description 'Enable distributed hash table (DHT)'
+complete -c transmission-remote -s O -l no-dht --description 'Disable distribued hash table (DHT)'
+complete -c transmission-remote -s p -l port --description 'Set the port to use when listening'
+complete -c transmission-remote -o Bh -l bandwidth-high --description 'Give this torrent high bandwidth'
+complete -c transmission-remote -o Bn -l bandwidth-normal --description 'Give this torrent normal bandwidth'
+complete -c transmission-remote -o Bl -l bandwidth-low --description 'Give this torrent low bandwidth'
+complete -c transmission-remote -o ph -l priority-high --description 'Try to download the specified files first'
+complete -c transmission-remote -o pn -l priority-normal --description 'Try to download the specified files normally'
+complete -c transmission-remote -o pl -l priority-low --description 'Try to download the specified files last'
+complete -c transmission-remote -o pr -l peers --description 'Set the maximum number of peers'
+complete -c transmission-remote -s r -l remove --description 'Remove the current torrents'
+complete -c transmission-remote -l remove-and-delete --description 'Remove the current torrents and delete data'
+complete -c transmission-remote -l reannounce --description 'Reannounce the current torrents'
+complete -c transmission-remote -l move --description 'Move the current torrents\' data to another directory'
+complete -c transmission-remote -l find --description 'Where to look for the current torrents\' data'
+complete -c transmission-remote -o sr -l seedratio --description 'Current torrents seed until a specific ratio'
+complete -c transmission-remote -o SR -l no-seedratio --description 'Current torrents seed regardless of ratio'
+complete -c transmission-remote -o srd -l seedratio-default --description 'Current torrents use global seedratio'
+complete -c transmission-remote -o td -l tracker-add --description 'Add a tracker to a torrent'
+complete -c transmission-remote -o tr -l tracker-remove --description 'Remove a tracker from a torrent'
+complete -c transmission-remote -s s -l start --description 'Start the current torrents'
+complete -c transmission-remote -s S -l stop --description 'Stop the current torrents'
+complete -c transmission-remote -l start-paused --description 'Start added torrents paused'
+complete -c transmission-remote -l no-start-paused --description 'Start added torrents unpaused'
+complete -c transmission-remote -s t -l torrent --description 'Set torrents as current for subsequent options'
+complete -c transmission-remote -l trash-torrent --description 'Delete torrents after adding'
+complete -c transmission-remote -l no-trash-torrent --description 'Do not delete torrents after adding'
+complete -c transmission-remote -o hl -l honor-session --description 'Current torrents honor session limits'
+complete -c transmission-remote -o HL -l no-honor-session --description 'Make the current torrent(s) not honor the session limits'
+complete -c transmission-remote -s u -l uplimit --description 'Limit the maximum upload speed (KiB/s)'
+complete -c transmission-remote -s U -l no-uplimit --description 'Disable upload speed limits'
+complete -c transmission-remote -l utp --description 'Enable uTP for peer connections'
+complete -c transmission-remote -l no-utp --description 'Disable uTP for peer connections'
+complete -c transmission-remote -s v -l verify --description 'Verify the current torrents'
+complete -c transmission-remote -s V -l version --description 'Show version number and exit'
+complete -c transmission-remote -s w -l download-dir --description 'Use directory as default for new downloads'
+complete -c transmission-remote -s x -l pex --description 'Enable peer exchange (PEX)'
+complete -c transmission-remote -s X -l no-pex --description 'Disable peer exchange (PEX)'
+complete -c transmission-remote -s y -l lds --description 'Enable local peer discovery (LPD)'
+complete -c transmission-remote -s Y -l no-lds --description 'Disable local peer discovery (LPD)'
+complete -c transmission-remote -o pi -l peer-info --description 'List the current torrent\'s connected peers'