diff -r 27b19cd0274b -r e2ce1a4139a2 ImageEditor.st
--- a/ImageEditor.st	Fri Aug 05 16:06:28 2005 +0200
+++ b/ImageEditor.st	Fri Aug 05 16:09:21 2005 +0200
@@ -2003,40 +2003,25 @@
                  (Menu
                     (
                      (MenuItem
-                        activeHelpKey: colorMap24
-                        label: '24-Plane'
-                        itemValue: colorMapMode:
-                        translateLabel: true
-                        argument: depth24
-                        choice: colorMapMode
-                        choiceValue: depth24
-                      )
-                     (MenuItem
-                        activeHelpKey: colorMap16
-                        label: '16-Plane'
+                        activeHelpKey: colorMap1
+                        label: '1-Plane'
                         itemValue: colorMapMode:
                         translateLabel: true
-                        argument: depth16
+                        argument: depth1
                         choice: colorMapMode
-                        choiceValue: depth16
+                        choiceValue: depth1
                       )
                      (MenuItem
-                        activeHelpKey: colorMap8
-                        label: '8-Plane'
+                        activeHelpKey: colorMap1M
+                        label: '1-Plane + Mask'
                         itemValue: colorMapMode:
                         translateLabel: true
-                        argument: depth8
+                        argument: masked1
                         choice: colorMapMode
-                        choiceValue: depth8
+                        choiceValue: masked1
                       )
                      (MenuItem
-                        activeHelpKey: colorMap4
-                        label: '4-Plane'
-                        itemValue: colorMapMode:
-                        translateLabel: true
-                        argument: depth4
-                        choice: colorMapMode
-                        choiceValue: depth4
+                        label: '-'
                       )
                      (MenuItem
                         activeHelpKey: colorMap2
@@ -2048,25 +2033,67 @@
                         choiceValue: depth2
                       )
                      (MenuItem
-                        activeHelpKey: colorMap1
-                        label: '1-Plane'
+                        activeHelpKey: colorMap2M
+                        label: '2-Plane + Mask'
                         itemValue: colorMapMode:
                         translateLabel: true
-                        argument: depth1
+                        argument: masked2
                         choice: colorMapMode
-                        choiceValue: depth1
+                        choiceValue: masked2
                       )
                      (MenuItem
                         label: '-'
                       )
                      (MenuItem
-                        activeHelpKey: colorMap24M
-                        label: '24-Plane + Mask'
+                        activeHelpKey: colorMap4
+                        label: '4-Plane'
+                        itemValue: colorMapMode:
+                        translateLabel: true
+                        argument: depth4
+                        choice: colorMapMode
+                        choiceValue: depth4
+                      )
+                     (MenuItem
+                        activeHelpKey: colorMap4M
+                        label: '4-Plane + Mask'
+                        itemValue: colorMapMode:
+                        translateLabel: true
+                        argument: masked4
+                        choice: colorMapMode
+                        choiceValue: masked4
+                      )
+                     (MenuItem
+                        label: '-'
+                      )
+                     (MenuItem
+                        activeHelpKey: colorMap8
+                        label: '8-Plane'
                         itemValue: colorMapMode:
                         translateLabel: true
-                        argument: masked24
+                        argument: depth8
+                        choice: colorMapMode
+                        choiceValue: depth8
+                      )
+                     (MenuItem
+                        activeHelpKey: colorMap8M
+                        label: '8-Plane + Mask'
+                        itemValue: colorMapMode:
+                        translateLabel: true
+                        argument: masked8
                         choice: colorMapMode
-                        choiceValue: masked24
+                        choiceValue: masked8
+                      )
+                     (MenuItem
+                        label: '-'
+                      )
+                     (MenuItem
+                        activeHelpKey: colorMap16
+                        label: '16-Plane'
+                        itemValue: colorMapMode:
+                        translateLabel: true
+                        argument: depth16
+                        choice: colorMapMode
+                        choiceValue: depth16
                       )
                      (MenuItem
                         activeHelpKey: colorMap16M
@@ -2078,40 +2105,25 @@
                         choiceValue: masked16
                       )
                      (MenuItem
-                        activeHelpKey: colorMap8M
-                        label: '8-Plane + Mask'
-                        itemValue: colorMapMode:
-                        translateLabel: true
-                        argument: masked8
-                        choice: colorMapMode
-                        choiceValue: masked8
+                        label: '-'
                       )
                      (MenuItem
-                        activeHelpKey: colorMap4M
-                        label: '4-Plane + Mask'
+                        activeHelpKey: colorMap24
+                        label: '24-Plane'
                         itemValue: colorMapMode:
                         translateLabel: true
-                        argument: masked4
+                        argument: depth24
                         choice: colorMapMode
-                        choiceValue: masked4
+                        choiceValue: depth24
                       )
                      (MenuItem
-                        activeHelpKey: colorMap2M
-                        label: '2-Plane + Mask'
+                        activeHelpKey: colorMap24M
+                        label: '24-Plane + Mask'
                         itemValue: colorMapMode:
                         translateLabel: true
-                        argument: masked2
+                        argument: masked24
                         choice: colorMapMode
-                        choiceValue: masked2
-                      )
-                     (MenuItem
-                        activeHelpKey: colorMap1M
-                        label: '1-Plane + Mask'
-                        itemValue: colorMapMode:
-                        translateLabel: true
-                        argument: masked1
-                        choice: colorMapMode
-                        choiceValue: masked1
+                        choiceValue: masked24
                       )
                      )
                     nil