--- a/ImageEditor.st	Fri Nov 15 10:20:45 2002 +0100
+++ b/ImageEditor.st	Mon Nov 18 11:10:43 2002 +0100
@@ -220,7 +220,7 @@
 'Paste Under'
 
 #drawModePasteWithMask
-'Paste With Mask'
+'Paste with Mask'
 
 #drawModePoint
 'Point'
@@ -1634,7 +1634,7 @@
                 )
                #(#MenuItem
                   #activeHelpKey: #fileGrabImage
-                  #label: 'Grab from Screen'
+                  #label: 'Grab from Screen...'
                   #itemValue: #grabScreenImage
                   #translateLabel: true
                 )
@@ -1662,9 +1662,6 @@
                   #translateLabel: true
                 )
                #(#MenuItem
-                  #label: '-'
-                )
-               #(#MenuItem
                   #activeHelpKey: #fileSaveAs
                   #enabled: #imageIsLoaded
                   #label: 'Save to File...'
@@ -1681,7 +1678,7 @@
                #(#MenuItem
                   #activeHelpKey: #fileSaveButtonImageAs
                   #enabled: #imageIsLoaded
-                  #label: 'Save As Button to File...'
+                  #label: 'Save as Button to File...'
                   #itemValue: #doSaveButtonImageToFileAs
                   #translateLabel: true
                 )
@@ -1865,7 +1862,7 @@
                 )
                #(#MenuItem
                   #activeHelpKey: #uncropManual
-                  #label: 'Ungrop (Add Border)...'
+                  #label: 'Uncrop (Add Border)...'
                   #itemValue: #doUnCropManual
                   #translateLabel: true
                 )
@@ -2254,7 +2251,7 @@
          #(#MenuItem
             #activeHelpKey: #drawModeFilledBox
             #enabled: #imageIsLoaded
-            #label: 'FillRect'
+            #label: 'Filled Rectangle'
             #translateLabel: true
             #choice: #editMode
             #choiceValue: #filledBox
@@ -2294,7 +2291,7 @@
          #(#MenuItem
             #activeHelpKey: #drawModePasteWithMask
             #enabled: #imageIsLoaded
-            #label: 'Paste With Mask'
+            #label: 'Paste with Mask'
             #translateLabel: true
             #choice: #editMode
             #choiceValue: #pasteWithMask
@@ -3315,8 +3312,9 @@
             shiftProcess := 
                 [
                     [
-                        imageEditView image colorMap:originalColormap copy.
-                        imageEditView image colorMapProcessing:[:clr | shiftedColor value:clr value:hShift value:lFactor value:sFactor].
+                        imageEditView image 
+                            colorMap:originalColormap copy;
+                            colorMapProcessing:[:clr | shiftedColor value:clr value:hShift value:lFactor value:sFactor].
                         self updateImage.
                         self updateInfoLabel.
                     ] ensure:[ shiftProcess := nil ].    
@@ -3325,13 +3323,13 @@
 
     bindings := IdentityDictionary new.
     bindings at:#hueShiftAmount put:(hueShift := 0 asValue).
-    (bindings at:#hueShiftAmount) onChangeEvaluate:shiftAction.
+    hueShift onChangeEvaluate:shiftAction.
 
     bindings at:#lightAmount put:(lightValue := 100 asValue).
-    (bindings at:#lightAmount) onChangeEvaluate:shiftAction.
+    lightValue onChangeEvaluate:shiftAction.
 
     bindings at:#saturationAmount put:(saturationValue := 100 asValue).
-    (bindings at:#saturationAmount) onChangeEvaluate:shiftAction.
+    saturationValue onChangeEvaluate:shiftAction.
 
     bindings at:#acceptChannel put:acceptChannel.
     bindings at:#hlsColor put:avgColorHolder.