6 files changed, 29 insertions, 101 deletions
diff --git a/Completion/X/_xdvi b/Completion/X/_xdvi
index ea08e5110..d24015ed5 100644
--- a/Completion/X/_xdvi
+++ b/Completion/X/_xdvi
@@ -6,13 +6,13 @@ _xt_arguments \
   '-altfont:default font:' \
   '-base:base URL:' \
   '-browser:WWW browser:_command_names -e' \
-  '-cr:cursor color:_colors' \
+  '-cr:cursor color:_x_color' \
   '-debug:debugging bitmask:((1\:bitmaps 2\:dvi\ translation 4\:pk\ reading 8\:batch\ operation 16\:events 32\:file\ opening 64\:PostScript\ communication 128\:Kpathsea\ statistics 256\:Kpathsea\ hash\ table\ lookups 512\:Kpathsea\ path\ definitions 1024\:Kpathsea\ path\ expansion 2048\:Kpathsea\ searches))' \
   '-density:font shrink density:' \
   '-gamma:anti-aliasing factor (default 1.0):' \
-  -grid{1,2,3}':grid color:_colors' \
+  -grid{1,2,3}':grid color:_x_color' \
   '-gspalette:Ghostscript palette:(Color Greyscale Monochrome)' \
-  '-hl:page highlight color:_colors' \
+  '-hl:page highlight color:_x_color' \
   '-icongeometry:icon geometry:_x_geometry' \
   '-interpreter:Ghostscript program:_command_names -e' \
   '-margin:margin size:' \
diff --git a/Completion/X/_xfig b/Completion/X/_xfig
index a0d36c189..e5c950e45 100644
--- a/Completion/X/_xfig
+++ b/Completion/X/_xfig
@@ -1,12 +1,12 @@
 #compdef xfig
 
-_x_options \
+_x_arguments \
   -{help,Landscape,Portrait,debug,dontswitchcmap,flushleft,inches,inverse,latexfonts,left,metric,monochrome,multiple,noscalablefonts,notrack,right,scalablefonts,showallbuttons,single,specialtext,tablet,track} \
   '-bold:bold font:_x_font' \
   '-button:button font:_x_font' \
   '-but_per_row:number of buttons:' \
-  '-cbg:canvas background color:_colors' \
-  '-cfg:canvas foreground color:_colors' \
+  '-cbg:canvas background color:_x_color' \
+  '-cfg:canvas foreground color:_x_color' \
   '-depth:visual depth:_x_visdepth' \
   '-exportlanguage:export language:(box latex epic eepic eepicemu pictex ibmgl eps ps pstex textyl tpic pic mf acad pcx png gif jpeg tiff ppm xbm xpm)' \
   '-iconGeometry:icon geometry:_x_geometry' \
diff --git a/Completion/X/_xsetroot b/Completion/X/_xsetroot
index a6f62e998..c3b361358 100644
--- a/Completion/X/_xsetroot
+++ b/Completion/X/_xsetroot
@@ -1,12 +1,12 @@
 #compdef xsetroot
 
-_x_options \
+_x_arguments \
   -{help,def,gray,grey,rv} \
   '-cursor:cursor file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\):mask file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\|mask\)' \
-  '-cursor_name:cursor name:_cursors' \
+  '-cursor_name:cursor name:_x_cursor' \
   '-bitmap:bitmap file:_files -g \*.\(\#i\)xbm' \
   '-mod:x grid distance (1-16): :y grid distance (1-16):' \
-  '-fg:foreground color:_colors' \
-  '-bg:background color:_colors' \
-  '-solid:screen solid color:_colors' \
+  '-fg:foreground color:_x_color' \
+  '-bg:background color:_x_color' \
+  '-solid:screen solid color:_x_color' \
   '-name:root window name:'
diff --git a/Completion/X/_xt_arguments b/Completion/X/_xt_arguments
index 14e7b93f0..6ed8b9d27 100644
--- a/Completion/X/_xt_arguments
+++ b/Completion/X/_xt_arguments
@@ -23,17 +23,17 @@
 _arguments \
   -+{rv,synchronous} \
   -{reverse,iconic} \
-  '-background:background color:_colors' \
-  '-bd:border color:_colors' \
-  '-bg:background color:_colors' \
-  '-bordercolor:border color:_colors' \
+  '-background:background color:_x_color' \
+  '-bd:border color:_x_color' \
+  '-bg:background color:_x_color' \
+  '-bordercolor:border color:_x_color' \
   '-borderwidth:border width:_x_borderwidth' \
   '-bw:border width:_x_borderwidth' \
   '-display:display:_x_display' \
-  '-fg:foreground color:_colors' \
+  '-fg:foreground color:_x_color' \
   '-font:font:_x_font' \
   '-fn:font:_x_font' \
-  '-foreground:foreground color:_colors' \
+  '-foreground:foreground color:_x_color' \
   '-geometry:geometry:_x_geometry' \
   '-name:name:_x_name' \
   '-selectionTimeout:selection timeout (milliseconds):_x_selection_timeout' \
diff --git a/Completion/X/_xterm b/Completion/X/_xterm
index 750f7bf88..ef2de3007 100644
--- a/Completion/X/_xterm
+++ b/Completion/X/_xterm
@@ -7,13 +7,13 @@ _xt_arguments \
   '-bcf:time text cursor is off when blinking (milliseconds):' \
   '-bcn:time text cursor is on when blinking (milliseconds):' \
   '-cc:character class:' \
-  '-cr:text cursor color:_colors' \
+  '-cr:text cursor color:_x_color' \
   '-e:program: _command_names -e:*::program arguments: _normal' \
   '-fb:bold font:_x_font' \
   '-fi:icon font:_x_font' \
-  '-hc:background color for highlighted text:_colors' \
+  '-hc:background color for highlighted text:_x_color' \
   '-mc:multi-click threshold (milliseconds):' \
-  '-ms:pointer cursor color:_colors' \
+  '-ms:pointer cursor color:_x_color' \
   '-nb:margin bell number:' \
   '-sl:save lines:' \
   '-ti:terminal ID:(vt52 vt100 vt101 vt102 vt220)' \
@@ -22,75 +22,3 @@ _xt_arguments \
   '-ziconbeep:iconbeep (percent):' \
   '-C' \
   '-S-:pseudo-terminal and file descriptor:'
-#compdef xterm
-
-_arguments \
-  '-version' \
-  '-help' \
-  '-132' \
-  '-ah' '+ah' \
-  '-ai' '+ai' \
-  '-aw' '+aw' \
-  '-b:inner border size:' \
-  '-bc' '+bc' \
-  '-bcf:time text cursor is off when blinking (milliseconds):' \
-  '-bcn:time text cursor is on when blinking (milliseconds):' \
-  '-bdc' '+bdc' \
-  '-cb' '+cb' \
-  '-cc:character class:' \
-  '-cm' '+cm' \
-  '-cn' '+cn' \
-  '-cr:text cursor color:_color' \
-  '-cu' '+cu' \
-  '-dc' '+dc' \
-  '-e:*::program: _normal' \
-  '-fb:bold font:' \
-  '-fi:icon font:' \
-  '-hc:background color for highlighted text:_color' \
-  '-hf' '+hf' \
-  '-ie' '+ie' \
-  '-im' '+im' \
-  '-j' '+j' \
-  '-leftbar' \
-  '-ls' '+ls' \
-  '-mb' '+mb' \
-  '-mc:multi-click threshold (milliseconds):' \
-  '-ms:pointer cursor color:_color' \
-  '-nb:margin bell number:' \
-  '-nul' '+nul' \
-  '-pc' '+pc' \
-  '-rightbar' \
-  '-rw' '+rw' \
-  '-s' '+s' \
-  '-samename' '+samename' \
-  '-sb' '+sb' \
-  '-sf' '+sf' \
-  '-si' '+si' \
-  '-sk' '+sk' \
-  '-sl:save lines:' \
-  '-sp' '+sp' \
-  '-t' '+t' \
-  '-ti:terminal ID:(vt52 vt100 vt101 vt102 vt220)' \
-  '-tm:terminal setting:' \
-  '-tn:terminal type:' \
-  '-u8' '+u8' \
-  '-ulc' '+ulc' \
-  '-ut' '+ut' \
-  '-vb' '+vb' \
-  '-wc' '+wc' \
-  '-wf' '+wf' \
-  '-ziconbeep:iconbeep (percent):' \
-  '-C' \
-  '-S-:pseudo-terminal and file descriptor:' \
-  '-bd:border color:_color' \
-  '-bg:background color:_color' \
-  '-bw:border width:' \
-  '-display:display:' \
-  '-fg:foreground color:_color' \
-  '-fn:font:' \
-  '-geometry:geometry:' \
-  '-iconic' \
-  '-name:name:' \
-  '-rv' \
-  '-title:title:' \
-  '-xrm:resource:'
diff --git a/Completion/X/_xv b/Completion/X/_xv
index 4178e1dad..bf382c6bf 100644
--- a/Completion/X/_xv
+++ b/Completion/X/_xv
@@ -1,20 +1,20 @@
 #compdef xv
 
-_x_options \
+_x_arguments \
   -{help,quick24,slow24,best24,noqcheck,pkludge,RM} \
   -+{fixed,rw,perfect,owncmap,stdcmap,cecmap,ninstall,8,24,root,noresetroot,max,maxpect,quit,clear,cmap,imap,cemap,cmtmap,vsmap,nopos,dither,smooth,raw,acrop,4x3,hflip,vflip,norm,hist,mono,rv,wloop,random,loadclear,nofreecols,rgb,hsv,lbrowse,nostat,2xlimit,nolimits,close,iconic,viewonly,poll,vsperfect,vsdisable,nodecor} \
-  '-fg:foreground color:_colors' \
-  '-bg:background color:_colors' \
-  '-hi:top left shadow color:_colors' \
-  '-lo:bottom right shadow color:_colors' \
+  '-fg:foreground color:_x_color' \
+  '-bg:background color:_x_color' \
+  '-hi:top left shadow color:_x_color' \
+  '-lo:bottom right shadow color:_x_color' \
   '-bw:border width:' \
   '-geometry:geometry:_x_geometry' \
   '-expand:expansion factor:' \
   '-aspect:aspect ratio (e.g. 4:3):' \
   '-ncols:maximum number of colors used:' \
   '-rmode:root display mode:((0\:tiling 1\:integer\ tiling 2\:mirrored\ tiling 3\:integer\ mirrored\ tiling 4\:centered\ tiling 5\:centered\ tiling\ on\ solid\ background 6\:centered\ tiling\ on\ '\\\''warp'\\\''\ background 7\:centered\ tiling\ on\ '\\\''brick'\\\''\ background 8\:symmetrical\ tiling 9\:symmetrical\ mirrored\ tiling))' \
-  '-rfg:root foreground color:_colors' \
-  '-rbg:root background color:_colors' \
+  '-rfg:root foreground color:_x_color' \
+  '-rbg:root background color:_x_color' \
   '-cgeom:control window geometry:_x_geometry' \
   '-igeom:info window geometry:_x_geometry' \
   '-cegeom:color editor window geometry:_x_geometry' \
@@ -26,8 +26,8 @@ _x_options \
   '-gamma:gamma value:' \
   '-cgamma:red gamma value: :green gamma value: :blue gamma value:' \
   '-preset:default preset (1-4):(1 2 3 4)' \
-  '-white:'"'"'white'"'"' color:_colors' \
-  '-black:'"'"'black'"'"' color:_colors' \
+  '-white:'"'"'white'"'"' color:_x_color' \
+  '-black:'"'"'black'"'"' color:_x_color' \
   '-wait:seconds to wait:' \
   '-visual:visual:(TrueColor StaticColor DirectColor StaticGray GrayScale PseudoColor)' \
   '-cursor:cursor character number:' \