Index: editor/options/src/org/netbeans/modules/options/colors/CategoryComparator.java
===================================================================
RCS file: /cvs/editor/options/src/org/netbeans/modules/options/colors/CategoryComparator.java,v
retrieving revision 1.9
diff -u -r1.9 CategoryComparator.java
--- editor/options/src/org/netbeans/modules/options/colors/CategoryComparator.java	1 Oct 2007 15:48:53 -0000	1.9
+++ editor/options/src/org/netbeans/modules/options/colors/CategoryComparator.java	16 Dec 2007 14:22:56 -0000
@@ -44,6 +44,7 @@
 import java.util.Comparator;
 import javax.swing.text.AttributeSet;
 import org.netbeans.api.editor.settings.EditorStyleConstants;
+import org.openide.util.NbBundle;
 
 
 /**
@@ -51,19 +52,20 @@
  * @author Jan Jancura
  */
 public final class CategoryComparator implements Comparator<AttributeSet> {
-
+    String default_string = NbBundle.getMessage(org.netbeans.modules.editor.NbEditorKit.class, "default");
+                
     public int compare (AttributeSet o1, AttributeSet o2) {
         String name_1 = name(o1);
         String name_2 = name(o2);
-	if (name_1.startsWith ("default")) // NOI18N
-	    return name_2.startsWith ("default") ? 0 : -1; // NOI18N
-        if (name_2.startsWith ("default")) // NOI18N
+	if (name_1.startsWith (default_string))
+	    return name_2.startsWith (default_string) ? 0 : -1;
+        if (name_2.startsWith (default_string))
             return 1;
 	return name_1.compareTo (name_2);
     }
     
     private static String name (AttributeSet o) {
-        return ((String) o.getAttribute(EditorStyleConstants.DisplayName)).toLowerCase();
+        return ((String) o.getAttribute(EditorStyleConstants.DisplayName));
     }
     
 }
Index: editor/options/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
===================================================================
RCS file: /cvs/editor/options/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java,v
retrieving revision 1.48
diff -u -r1.48 SyntaxColoringPanel.java
--- editor/options/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java	10 Oct 2007 15:29:47 -0000	1.48
+++ editor/options/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java	16 Dec 2007 14:22:56 -0000
@@ -997,6 +997,8 @@
         public int compare(String o1, String o2) {
             if (o1.equals(ColorModel.ALL_LANGUAGES))
                 return o2.equals(ColorModel.ALL_LANGUAGES) ? 0 : -1;
+            if (o2.equals(ColorModel.ALL_LANGUAGES))
+                return 1;
             return o1.compareTo(o2);
         }
     }