5 files changed, 52 insertions, 7 deletions
diff --git a/Completion/X/Command/_evince b/Completion/X/Command/_evince
index 48d5a9aeb..21b493360 100644
--- a/Completion/X/Command/_evince
+++ b/Completion/X/Command/_evince
@@ -5,12 +5,8 @@ _arguments -s -S \
   '--version[display version information]' \
   {-h,--help}'[display help information]' \
   '--help-all[display help on all options]' \
-  '--help-sm-client[display help on session management options]' \
   '--help-gtk[display help on GTK+ options]' \
   - normal \
-  '--sm-client-disable[disable connection to session manager]' \
-  '--sm-client-state-file=[specify file containing saved configuration]:file:_files' \
-  '--sm-client-id=[specify session management ID]:id' \
   '--class=[specify program class as used by the window manager]:class' \
   '--name=[program name as used by the window manager]:name:_x_name' \
   '--gdk-debug=[specify GDK debugging flags to set]:flag' \
diff --git a/Completion/X/Command/_kdeconnect b/Completion/X/Command/_kdeconnect
new file mode 100644
index 000000000..ffb7f5774
--- /dev/null
+++ b/Completion/X/Command/_kdeconnect
@@ -0,0 +1,33 @@
+#compdef kdeconnect-cli
+
+_kdeconnect_device-ids() {
+  compadd $(kdeconnect-cli --list-available --id-only)
+}
+
+_arguments \
+  '(-l --list-devices -a --list-available)'{-l,--list-devices}'[list all devices]' \
+  '(-l --list-devices -a --list-available)'{-a,--list-available}'[list available (paired and reachable) devices]' \
+  '--id-only[make --list-devices or --list-available print only the devices id, to ease scripting]' \
+  '--refresh[search for devices in the network and re-establish connections]' \
+  '(--pair --unpair)--pair[request pairing with the specified device]' \
+  '--ring[find the device by ringing it.]' \
+  '(--pair --unpair)--unpair[stop pairing to the specified device]' \
+  '(--ping --ping-msg)--ping[send a ping to the device]' \
+  '(--ping --ping-msg)--ping-msg[send a ping to the device with the specified message]:message' \
+  '--share[share a file to the device]:file:_files' \
+  '--list-notifications[display the notifications on the device]' \
+  '--lock[lock the specified device]' \
+  '--send-sms[send an SMS. Requires --destination]:message' \
+  '--destination[specify phone number to send the SMS to]:phone number' \
+  '(-d --device -n --name)'{-d,--device}'[specify device ID]:id:_kdeconnect_device-ids' \
+  '(-d --device -n --name)'{-n,--name}'[specify device name]:name' \
+  '--encryption-info[get encryption info about the device]' \
+  '--list-commands[list remote commands and their ids]' \
+  '--execute-command[execute a remote command]:command id' \
+  '(-k --send-keys)'{-k,--send-keys}'[send keys to the specified device]' \
+  "--my-id[display this device's id and exit]" \
+  '(-)'{-h,--help}'[display usage information]' \
+  '(-)'{-v,--version}'[display version information]' \
+  '(-)--author[show author information and exit]' \
+  '(-)--license[show license information and exit]' \
+  '--desktopfile[specify base file name of the desktop entry for this application]:file'
diff --git a/Completion/X/Command/_sublimetext b/Completion/X/Command/_sublimetext
new file mode 100644
index 000000000..1243d2779
--- /dev/null
+++ b/Completion/X/Command/_sublimetext
@@ -0,0 +1,13 @@
+#compdef subl
+
+_arguments -s -S : \
+  '(-a -n --add --new-window)'{-a,--add}'[add to current window]' \
+  '(-b --background)'{-b,--background}"[don't activate application]" \
+  '--command[run specified command]:command' \
+  '(: -)'{-h,--help}'[display help information]' \
+  '(-a -n --add --new-window)'{-n,--new-window}'[open new window]' \
+  '--project[load specified project]:project file:_files' \
+  '(-s --stay)'{-s,--stay}'[keep application activated]' \
+  '(: -)'{-v,--version}'[display version information]' \
+  '(-w --wait)'{-w,--wait}'[wait for files to close]' \
+  '*:file or directory:_files'
diff --git a/Completion/X/Command/_xrandr b/Completion/X/Command/_xrandr
index b0851569e..26d8cd082 100644
--- a/Completion/X/Command/_xrandr
+++ b/Completion/X/Command/_xrandr
@@ -58,8 +58,11 @@ case $state in
     esac
   ;;
   outputs)
-    _wanted outputs expl output compadd \
-        ${(uo)${(M)${(f)"$(_call_program outputs xrandr)"}:#* connected*}%% *} && return 0
+    local -a xrandr_output=(${(f)"$(_call_program outputs xrandr)"})
+    _alternative \
+	'connected:connected outputs:('${(j: :)${(uo)${(M)xrandr_output:#* connected*}%% *}}')' \
+	'disconnected:disconnected outputs:('${(j: :)${(uo)${(M)xrandr_output:#* disconnected*}%% *}}')' \
+	&& return 0
   ;;
   modes)
     _wanted modes expl mode compadd \
diff --git a/Completion/X/Command/_xset b/Completion/X/Command/_xset
index 53ec635d4..b35a6466b 100644
--- a/Completion/X/Command/_xset
+++ b/Completion/X/Command/_xset
@@ -111,7 +111,7 @@ _regex_arguments _xset_parse \
   \) \#
 
 _xset () {
-  local expl allopts
+  local expl allopts opt
   typeset -A desc no eo
 
   desc=(