Index: /branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/cdot.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/cdot.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/cdot.c	(revision 40156)
@@ -22,5 +22,5 @@
 
   /* set point style and errorbar mode (these are NOT sticky) */
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.etype = 0;
 
Index: /branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/cgrid.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/cgrid.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/cgrid.c	(revision 40156)
@@ -276,6 +276,6 @@
   /* send the line segments as connect-points */
   Xvec.Nelements = Yvec.Nelements = N;
-  graphmode.style = 2; /* points */
-  graphmode.ptype = 100; /* connect a pair */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
+  graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
   graphmode.etype = 0;
   PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
Index: /branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/czplot.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/czplot.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/cmd.astro/czplot.c	(revision 40156)
@@ -111,5 +111,5 @@
   Zvec.Nelements = Npts;
 
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.size = -1; /* point size determined by Zvec */
   graphmode.etype = 0;
Index: /branches/eam_branches/ohana.20170822/src/opihi/cmd.data/grid.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/cmd.data/grid.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/cmd.data/grid.c	(revision 40156)
@@ -175,6 +175,6 @@
 
   Xvec.Nelements = Yvec.Nelements = N;
-  graphmode.style = 2; /* points */
-  graphmode.ptype = 100; /* connect a pair */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
+  graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
   graphmode.etype = 0;
   PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
Index: /branches/eam_branches/ohana.20170822/src/opihi/cmd.data/zplot.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/cmd.data/zplot.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/cmd.data/zplot.c	(revision 40156)
@@ -117,5 +117,5 @@
 
   /* point size determined by Zvec */
-  graphmode.style = 2; /* plot points */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.size = -1; /* point size determined by Zvec */
   PlotVectorTriplet (kapa, xvec, yvec, &Zvec, mask, &graphmode);
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/catalog.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/catalog.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/catalog.c	(revision 40156)
@@ -390,5 +390,5 @@
     REALLOCATE (Zvec.elements, float, MAX (Zvec.Nelements, 1));
     
-    graphmode.style = 2; /* set style to points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
     graphmode.size = -1; /* point size determined by Zvec */
     graphmode.etype = 0; /* no errorbars */
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/dmt.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/dmt.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/dmt.c	(revision 40156)
@@ -150,5 +150,5 @@
     vec5[0].Nelements = Dvec.Nelements;
   } else {
-    graphmode.style = 2; /* set style to points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
     PlotVector (kapa, N, Xvec.elements, Yvec.elements, &graphmode);
 
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/fitcolors.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/fitcolors.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/fitcolors.c	(revision 40156)
@@ -92,6 +92,6 @@
     graphdata.ymin = minDelta;
     graphdata.ymax = maxDelta;
-    graphdata.style = 2;
-    graphdata.ptype = 2;
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_CIRCLE_SOLID; /* connect pairs of points */
     KapaClearSections (kapa);
     KapaSetFont (kapa, "helvetica", 14);
@@ -192,6 +192,6 @@
     graphdata.ymin = minDelta;
     graphdata.ymax = maxDelta;
-    graphdata.style = 2;
-    graphdata.ptype = 2;
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_CIRCLE_SOLID; /* connect pairs of points */
   }
 
@@ -315,5 +315,5 @@
 	  deltaFit[i] = C0 + C1*colorFit[i];
 	}
-	graphdata.style = 0;
+	graphmode.style = KAPA_PLOT_CONNECT; /* lines */
 	graphdata.color = KapaColorByName ("red");
 
@@ -329,5 +329,5 @@
 	KapaSetFont (kapa, "helvetica", 14);
 
-	graphdata.style = 2;
+	graphmode.style = KAPA_PLOT_POINTS; /* points */
 	graphdata.color = KapaColorByName ("black");
 
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/fitsed.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/fitsed.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/fitsed.c	(revision 40156)
@@ -157,6 +157,6 @@
     if (!GetGraph (&graphdata, &kapa, NULL)) return (FALSE);
     SetLimitsRaw (wavecode, NULL, Nfilter, &graphdata);
-    graphdata.style = 2;
-    graphdata.ptype = 2;
+    graphdata.style = KAPA_PLOT_POINTS; /* points */
+    graphdata.ptype = KAPA_POINT_CIRCLE_SOLID;
     KapaClearSections (kapa);
     magSection.name = strcreate ("mag");
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/images.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/images.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/images.c	(revision 40156)
@@ -352,6 +352,6 @@
   Xvec.Nelements = Yvec.Nelements = N;
   if (N > 0) {
-    graphmode.style = 2; /* points */
-    graphmode.ptype = 100; /* connect pairs of points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/imbox.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/imbox.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/imbox.c	(revision 40156)
@@ -156,6 +156,6 @@
   Xvec.Nelements = Yvec.Nelements = Npts;
   if (Npts > 0) {
-    graphmode.style = 2; /* points */
-    graphmode.ptype = 100; /* connect pairs of points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/imdense.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/imdense.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/imdense.c	(revision 40156)
@@ -59,5 +59,5 @@
   Xvec.Nelements = Yvec.Nelements = N;
   if (N > 0) {
-    graphmode.style = 2; /* points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/imstats.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/imstats.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/imstats.c	(revision 40156)
@@ -51,5 +51,5 @@
   if (AutoLimits) SetLimits (&Xvec, &Yvec, &graphmode);
 
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.etype = 0;
   PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/paverage.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/paverage.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/paverage.c	(revision 40156)
@@ -81,5 +81,5 @@
     return (FALSE);
   }
-  graphmode.style = 2; /* set style to points */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.size = -1; /* point size determined by Zvec */
   graphmode.etype = 0; /* no errorbars */
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/pmeasure.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/pmeasure.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/pmeasure.c	(revision 40156)
@@ -154,5 +154,5 @@
     return (FALSE);
   }
-  graphmode.style = 2; /* set style to points */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.size = -1; /* point size determined by Zvec */
   graphmode.etype = 0; /* no errorbars */
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/procks.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/procks.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/procks.c	(revision 40156)
@@ -111,5 +111,5 @@
   Yvec.Nelements = Xvec.Nelements = N;
   
-  graphmode.style = 2; /* set style to points */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
   graphmode.etype = 0; /* no errorbars */
   PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
@@ -142,6 +142,6 @@
   Yvec.Nelements = Xvec.Nelements = N;
   
-  graphmode.style = 2; /* set style to points */
-  graphmode.ptype = 100; /* connect pairs */
+  graphmode.style = KAPA_PLOT_POINTS; /* points */
+  graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
   graphmode.etype = 0; /* no errorbars */
 
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/showtile.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/showtile.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/showtile.c	(revision 40156)
@@ -78,6 +78,6 @@
   Xvec.Nelements = Yvec.Nelements = N;
   if (N > 0) {
-    graphmode.style = 2; /* points */
-    graphmode.ptype = 100; /* connect pairs of points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/simage.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/simage.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/simage.c	(revision 40156)
@@ -118,5 +118,5 @@
   }
 
-  graphmode.style = 2;
+  graphmode.style = KAPA_PLOT_POINTS;
   graphmode.size = -1;
   graphmode.etype = 0;
Index: /branches/eam_branches/ohana.20170822/src/opihi/dvo/skycat.c
===================================================================
--- /branches/eam_branches/ohana.20170822/src/opihi/dvo/skycat.c	(revision 40155)
+++ /branches/eam_branches/ohana.20170822/src/opihi/dvo/skycat.c	(revision 40156)
@@ -121,6 +121,6 @@
   Xvec.Nelements = Yvec.Nelements = Npts;
   if (Npts > 0) {
-    graphmode.style = 2; /* points */
-    graphmode.ptype = 100; /* connect pairs of points */
+    graphmode.style = KAPA_PLOT_POINTS; /* points */
+    graphmode.ptype = KAPA_POINT_PAIR_CONNECT; /* connect pairs of points */
     graphmode.etype = 0;
     PlotVectorPair (kapa, &Xvec, &Yvec, NULL, &graphmode);