--- a/Tools__TagsBrowser.st	Tue Jan 24 23:28:01 2017 +0100
+++ b/Tools__TagsBrowser.st	Tue Jan 24 23:29:05 2017 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2002 by eXept Software AG
 	      All Rights Reserved
@@ -2836,13 +2834,13 @@
     label := item printString ? ''.
     (inSelection := self isInSelection:anIndex) ifTrue:[
         self hasFocus ifTrue:[    
-            self paint:hilightFgColor on:hilightBgColor.
+            gc paint:hilightFgColor on:hilightBgColor.
         ] ifFalse:[
-            self paint:hilightFgColorNoFocus on:hilightBgColorNoFocus
+            gc paint:hilightFgColorNoFocus on:hilightBgColorNoFocus
         ].
         label := label string.   "/ to avoid printing blue on blue
     ] ifFalse:[
-        self paint:fgColor on:bgColor.
+        gc paint:fgColor on:bgColor.
     ].
 
     lineNrString := ' [ %1 ]' bindWith:item lineNumber.
@@ -2898,22 +2896,22 @@
 
     wL > 0 ifFalse:[^ self].
 
-    self paint:(self hasFocus ifTrue:[hilightBgColor] ifFalse:[hilightBgColorNoFocus]).
-    self fillRectangleX:x0 y:y0 width:wL height:hL.
+    gc paint:(self hasFocus ifTrue:[hilightBgColor] ifFalse:[hilightBgColorNoFocus]).
+    gc fillRectangleX:x0 y:y0 width:wL height:hL.
 
     "/ DRAW THE FRAME
 
     hilightFrameColor notNil ifTrue:[
         hilightLevel == 0 ifTrue:[
-            self paint:hilightFrameColor.
-            self displayRectangleX:x0 y:y0 width:wL height:hL.
-          ^ self.
+            gc paint:hilightFrameColor.
+            gc displayRectangleX:x0 y:y0 width:wL height:hL.
+            ^ self.
         ]
     ] ifFalse:[
         hilightStyle == #motif ifTrue:[
-            self paint:bgColor.
+            gc paint:bgColor.
             y1 := y0 + 1.
-            self displayRectangleX:x0 + 1 y:y1 width:wL - 2 height:hL - 2.
+            gc displayRectangleX:x0 + 1 y:y1 width:wL - 2 height:hL - 2.
         ]
     ].