5 files changed, 8 insertions, 9 deletions
diff --git a/ds9/library/catcmd.tcl b/ds9/library/catcmd.tcl
index c07bece..ff6c45b 100644
--- a/ds9/library/catcmd.tcl
+++ b/ds9/library/catcmd.tcl
@@ -447,7 +447,8 @@ proc CATButton {which x y} {
 	# highlite
 	if {[$which get marker catalog $id property highlite]} {
 	    $which marker catalog $id highlite only
-	    $which marker catalog $id move back
+	    $which marker catalog $id move front
+	    $which marker catalog $id color red
 	    set imarker(motion) none
 	    return
 	}
@@ -579,7 +580,7 @@ proc CATRelease {which x y} {
 	rotate {$which marker catalog rotate end}
 	region {
 	    $which region catalog select end
-	    $which region catalog catalog highlite end
+	    $which region catalog highlite end
 	}
 	shiftregion {
 	    $which region catalog select shift end
diff --git a/ds9/library/catreg.tcl b/ds9/library/catreg.tcl
index c249dcf..0599153 100644
--- a/ds9/library/catreg.tcl
+++ b/ds9/library/catreg.tcl
@@ -380,9 +380,9 @@ proc CATReg {varname row interactive resultname} {
 	    # init result for substitutions
 	    if {$interactive} {
 		if {$var(edit)} {
-		    set template "\${sys};\${shape}(\${xx} \${yy} \${size}) # color=\${color} width=\${width} dash=\${dash} font=\{${font} ${fontsize} ${fontweight} ${fontslant}\} text=\{\${text}\} tag={${varname}} tag={${varname}.\${ii}} select=1 edit=1 move=1 rotate=1 delete=1 highlite=0 callback=select TBLHighliteCB {${varname}.\${ii}} callback=unselect TBLUnhighliteCB {${varname}.\${ii}} callback=edit CATEditCB {${varname}.\${ii}.\${szcol}.\${sz2col}.\${units}.\${angcol}} callback=move CATMoveCB {${varname}.\${ii}} callback=rotate CATRotateCB {${varname}.\${ii}.\${angcol}} callback=delete TBLDeleteCB {${varname}.\${ii}}\n"
+		    set template "\${sys};\${shape}(\${xx} \${yy} \${size}) # color=\${color} width=\${width} dash=\${dash} font=\{${font} ${fontsize} ${fontweight} ${fontslant}\} text=\{\${text}\} tag={${varname}} tag={${varname}.\${ii}} select=1 edit=1 move=1 rotate=1 delete=1 highlite=0 callback=select TBLHighliteCB {${varname}.\${ii}} callback=unselect TBLUnhighliteCB {${varname}.\${ii}} callback=edit CATEditCB {${varname}.\${ii}.\${szcol}.\${sz2col}.\${units}.\${angcol}} callback=move CATMoveCB {${varname}.\${ii}} callback=rotate CATRotateCB {${varname}.\${ii}.\${angcol}}\n"
 		} else {
-		    set template "\${sys};\${shape}(\${xx} \${yy} \${size}) # color=\${color} width=\${width} dash=\${dash} font=\{${font} ${fontsize} ${fontweight} ${fontslant}\} text=\{\${text}\} tag={${varname}} tag={${varname}.\${ii}} select=0 edit=0 move=0 rotate=0 delete=1 highlite=1 callback=delete TBLDeleteCB {${varname}.\${ii}} callback=highlite TBLHighliteCB {${varname}.\${ii}} callback=unhighlite TBLUnhighliteCB {${varname}.\${ii}}\n"
+		    set template "\${sys};\${shape}(\${xx} \${yy} \${size}) # color=\${color} width=\${width} dash=\${dash} font=\{${font} ${fontsize} ${fontweight} ${fontslant}\} text=\{\${text}\} tag={${varname}} tag={${varname}.\${ii}} select=0 edit=0 move=0 rotate=0 delete=1 highlite=1 callback=highlite TBLHighliteCB {${varname}.\${ii}} callback=unhighlite TBLUnhighliteCB {${varname}.\${ii} catalog}\n"
 		}
 	    } else {
 		set template "\${sys};\${shape}(\${xx} \${yy} \${size}) # color=\${color} width=\${width} dash=\${dash} text=\{\${text}\} tag=$varname\n"
diff --git a/ds9/library/fpcmd.tcl b/ds9/library/fpcmd.tcl
index 64b5868..c6baa5c 100644
--- a/ds9/library/fpcmd.tcl
+++ b/ds9/library/fpcmd.tcl
@@ -208,7 +208,8 @@ proc FPButton {which x y} {
 	# highlite
 	if {[$which get marker footprint $id property highlite]} {
 	    $which marker footprint $id highlite only
-	    $which marker footprint $id move back
+	    $which marker footprint $id move front
+	    $which marker footprint $id color red
 	    set imarker(motion) none
 	    return
 	}
diff --git a/ds9/library/fpreg.tcl b/ds9/library/fpreg.tcl
index 4ad6343..105515c 100644
--- a/ds9/library/fpreg.tcl
+++ b/ds9/library/fpreg.tcl
@@ -39,7 +39,7 @@ proc FPReg {varname interactive resultname} {
 	set color green
 
 	if {$interactive} {
-	    set template "# composite($ra,$dec,0) || composite=1 color=\${color} tag={${varname}} tag={${varname}.\${ii}} select=0 edit=0 move=0 rotate=0 delete=1 highlite=1 callback=delete TBLDeleteCB {${varname}.\${ii}} callback=highlite TBLHighliteCB {${varname}.\${ii}} callback=unhighlite TBLUnhighliteCB {${varname}.\${ii}}\n$rr\n"
+	    set template "# composite($ra,$dec,0) || composite=1 color=\${color} tag={${varname}} tag={${varname}.\${ii}} select=0 edit=0 move=0 rotate=0 delete=1 highlite=1 callback=highlite TBLHighliteCB {${varname}.\${ii}} callback=unhighlite TBLUnhighliteCB {${varname}.\${ii}}\n$rr\n"
 	} else {
 	    set template "# composite($ra,$dec,0) || composite=1 color=\${color} tag=$varname\n$rr\n"
 	}
diff --git a/ds9/library/table.tcl b/ds9/library/table.tcl
index 3771477..23a224f 100644
--- a/ds9/library/table.tcl
+++ b/ds9/library/table.tcl
@@ -307,9 +307,6 @@ proc TBLUnhighliteCB {tag id} {
     }
 }
 
-proc TBLDeleteCB {tag id} {
-}
-
 # Cut/Copy
 
 proc TBLCopy {varname} {