diff --git a/completions/zsh/_swaygrab b/completions/zsh/_swaygrab
index e0d654c3..0f9846f4 100644
--- a/completions/zsh/_swaygrab
+++ b/completions/zsh/_swaygrab
@@ -18,6 +18,6 @@ _arguments -s \
 	'(-c --capture)'{-c,--capture}'[Captures multiple frames as video and passes them to ffmpeg]' \
 	'(-o --output)'{-o,--output}'[Use the specified output. If not specified then current focused output will be used]' \
 	'(-v --version)'{-v,--version}'[Print the version (of swaymsg) and quit]' \
-	'(-s --socket)'{-s,--socket}'[Use the specified socket path. Otherwise, sway uses $SWAYSOCK then $I3SOCK]' \
+	'(-s --socket)'{-s,--socket}'[Use the specified socket path.]:files:_files' \
 	'(-r --rate)'{-r,--rate}'[Specify a framerate (in fps). Used in combination with -c. Default is 30 and must be an integer]' \
 	'(--raw)--raw[Instead of ImageMagick or ffmpeg, dump raw rgba data to stdout]'
diff --git a/completions/zsh/_swaymsg b/completions/zsh/_swaymsg
index 4baff92f..1713689a 100644
--- a/completions/zsh/_swaymsg
+++ b/completions/zsh/_swaymsg
@@ -12,9 +12,20 @@
 #  * Seth Barberee <seth.barberee@gmail.com>
 #
 #  -------------------------------------------
+
+types=(
+'get_workspaces'
+'get_inputs'
+'get_outputs'
+'get_tree'
+'get_marks'
+'get_bar_config'
+'get_version'
+)
+
 _arguments -s \
 	'(-v --version)'{-v,--version}'[Print the version (of swaymsg) and quit]' \
 	'(-h --help)'{-h,--help}'[Shows help message]' \
 	'(-q --quiet)'{-q,--quiet}'[Sends the IPC message but does not print the response from sway]' \
-	'(-s --socket)'{-s,--socket}'[Use the specified socket path. Otherwise, swaymsg uses $SWAYSOCK then $I3SOCK]' \
-	'(-t --type)'{-t,--type}'[Specify the type of IPC message. Tab completion still coming so use the man page instead]' 
+	'(-s --socket)'{-s,--socket}'[Use the specified socket path.]:files:_files' \
+    '(-t --type)'{-t,--type}'[Specify the type of IPC message.]:type:{_describe "type" types}'