From 3bc3f0b215958b5355f3d85c4537fa337afcb580 Mon Sep 17 00:00:00 2001
From: Wizard Atman <atman@idp-crew.com>
Date: Thu, 9 Apr 2015 12:28:23 +0400
Subject: [PATCH 1/3] Minor retrograde fix (JRE7 readAllLines charset problem)

---
 src/org/idp/laf/Kernel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/idp/laf/Kernel.java b/src/org/idp/laf/Kernel.java
index 23bde81..2a6146f 100644
--- a/src/org/idp/laf/Kernel.java
+++ b/src/org/idp/laf/Kernel.java
@@ -16,6 +16,7 @@ import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -99,7 +100,7 @@ public class Kernel {
             if( Files.isWritable(path))
             {
 
-                List<String> linesL =  Files.readAllLines(path);
+                List<String> linesL =  Files.readAllLines(path, StandardCharsets.UTF_8);
                 String [] lines = new String[linesL.size()];
 
                 int i = 0;

From 4ab179f3a9a20164a0f7b58410473a0db78fa0b9 Mon Sep 17 00:00:00 2001
From: Wizard Atman <atman@idp-crew.com>
Date: Thu, 9 Apr 2015 19:21:37 +0400
Subject: [PATCH 2/3] Remove of LAF - fixed, now switch back to Metall if
 removed

---
 manifest.mf                           |  2 +-
 src/org/idp/laf/Bundle.properties     |  3 +-
 src/org/idp/laf/Installer.java        | 50 ++++++++++++++--------
 src/org/idp/laf/Kernel.java           |  4 +-
 src/org/idp/laf/TitanEditor.java      | 30 ++++++++++++--
 src/org/idp/laf/TitanLookAndFeel.java | 60 +++++++++++++++++++++++++++
 src/org/idp/laf/TitanTheme.java       |  3 +-
 7 files changed, 125 insertions(+), 27 deletions(-)

diff --git a/manifest.mf b/manifest.mf
index 9cc33e4..5fe2932 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.idp.laf/1
-OpenIDE-Module-Implementation-Version: 1
+OpenIDE-Module-Implementation-Version: 2
 OpenIDE-Module-Localizing-Bundle: org/idp/laf/Bundle.properties
 OpenIDE-Module-Install: org/idp/laf/Installer.class
 OpenIDE-Module-Requires: org.openide.windows.WindowManager
diff --git a/src/org/idp/laf/Bundle.properties b/src/org/idp/laf/Bundle.properties
index 6ffaf46..ab9c8c0 100644
--- a/src/org/idp/laf/Bundle.properties
+++ b/src/org/idp/laf/Bundle.properties
@@ -2,6 +2,5 @@ OpenIDE-Module-Display-Category=Base IDE
 OpenIDE-Module-Long-Description=\
     This plugin was designed only to compose well readable and enoght radk theme for Netbeans, But day by day it was enlarging - and now it is what it is.
 OpenIDE-Module-Name=[idP!] Crew LAF
-LBL_TITAN=[idP!] Titan Theme
-LBL_TITAN_EDITOR=idP!
+LBL_TITAN=[idP!] Titan
 OpenIDE-Module-Short-Description=Editor for Netbeans Metal Look and Feel
diff --git a/src/org/idp/laf/Installer.java b/src/org/idp/laf/Installer.java
index 967fe92..836c957 100644
--- a/src/org/idp/laf/Installer.java
+++ b/src/org/idp/laf/Installer.java
@@ -7,9 +7,7 @@ package org.idp.laf;
 
 import java.util.prefs.Preferences;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 import org.openide.modules.ModuleInstall;
-import org.openide.util.NbBundle;
 import org.openide.util.NbPreferences;
 import org.openide.windows.WindowManager;
 
@@ -18,8 +16,6 @@ import org.openide.windows.WindowManager;
  */
 public class Installer extends ModuleInstall 
 {
-    private static boolean try_to_load_companion_colors = false;
-    
 
     @Override
     public void restored() {
@@ -33,14 +29,25 @@ public class Installer extends ModuleInstall
             }
         });
         
+        final Preferences prefs = NbPreferences.root().node( "laf" ); //NOI18N
+        
+        if( !prefs.getBoolean("idp.titan_editor.installed", false) ) //NOI18N
+        { 
+            WindowManager.getDefault().invokeWhenUIReady( new Runnable() 
+            {
+                @Override
+                public void run() {
+                    TitanEditor.load_editor();
+                     prefs.putBoolean("idp.titan_editor.installed", true ); //NOI18N
+                }
+            });
+           
+        }
+        
+       
+        
 
-        WindowManager.getDefault().invokeWhenUIReady( new Runnable() 
-        {
-            @Override
-            public void run() {
-                TitanEditor.load_editor();
-            }
-        });
+       
 
         
     }
@@ -49,13 +56,22 @@ public class Installer extends ModuleInstall
 
     @Override
     public void validate() throws IllegalStateException 
-    {    
-        Preferences prefs = NbPreferences.root().node( "laf" ); //NOI18N
-        if( !prefs.getBoolean("idp.titan.installed", false) ) { //NOI18N
-            prefs.put( "laf", TitanLookAndFeel.class.getName() ); //NOI18N
-        }
-        prefs.putBoolean("idp.titan.installed", true ); //NOI18N
+    {   
+        System.out.println(">>>> Validate");
+      //  Preferences prefs = NbPreferences.root().node( "laf" ); //NOI18N
+      //  if( !prefs.getBoolean("idp.titan.installed", false) ) { //NOI18N
+      //      prefs.put( "laf", TitanLookAndFeel.class.getName() ); //NOI18N
+      //  }
+      //  prefs.putBoolean("idp.titan.installed", true ); //NOI18N
         TitanLookAndFeel.self_install();
     }
+
+    @Override
+    public void uninstalled() {
+        System.out.println(">>>> uninstalled" );
+        TitanLookAndFeel.self_remove();
+//  super.uninstalled(); //To change body of generated methods, choose Tools | Templates.
+        
+    }
     
 }
diff --git a/src/org/idp/laf/Kernel.java b/src/org/idp/laf/Kernel.java
index 2a6146f..4eaee85 100644
--- a/src/org/idp/laf/Kernel.java
+++ b/src/org/idp/laf/Kernel.java
@@ -84,8 +84,8 @@ public class Kernel {
     
     private static boolean prepare_titan_laf ()
     {   
-        UIManager.put("nb.forceui", true);
-        UIManager.put("netbeans.plaf.disable.ui.customizations", false);
+     //   UIManager.put("nb.forceui", true);
+     //   UIManager.put("netbeans.plaf.disable.ui.customizations", false);
         return UIManager.getLookAndFeel().getName().equals(NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN"));
     }
     
diff --git a/src/org/idp/laf/TitanEditor.java b/src/org/idp/laf/TitanEditor.java
index 5047d36..0e61719 100644
--- a/src/org/idp/laf/TitanEditor.java
+++ b/src/org/idp/laf/TitanEditor.java
@@ -24,6 +24,7 @@ import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.openide.util.NbPreferences;
 
 /**
@@ -91,7 +92,7 @@ public class TitanEditor {
     private static Object colorModel;
     
     private static final String DEFAULT_THEME_NAME = "NetBeans";   //NOI18N
-    private static final String TITAN_THEME_NAME = "[idP!] Titan"; //NOI18N
+    private static final String TITAN_THEME_NAME = NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
     
     private static Class provider_GIT = null;
     private static Class provider_SVN = null;
@@ -296,9 +297,7 @@ public class TitanEditor {
     private static void setup_theme () throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
     {
         String current_profile = (String) getCurrentProfile.invoke( colorModel, new Object[0] );               
-      //  System.out.println("Current profile = " + current_profile);
-//        if (!current_profile.equals(TITAN_THEME_NAME))
-//        {
+ 
             Set<String> profile_set = (Set<String>) getProfiles.invoke( colorModel, new Object[0] );
             boolean contain_target_theme = false;
             for (String str : profile_set)
@@ -317,6 +316,29 @@ public class TitanEditor {
         //}
     }
     
+    public static void remove_editor () throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
+    {
+        Set<String> profile_set = (Set<String>) getProfiles.invoke( colorModel, new Object[0] );
+        boolean contain_target_theme = false;
+        for (String str : profile_set)
+        {
+                if (str.equals(TITAN_THEME_NAME)) contain_target_theme = true;
+        }
+            
+        if (contain_target_theme)
+        {
+            setCurrentProfile.invoke(colorModel, TITAN_THEME_NAME);
+            
+            
+            setCurrentProfile.invoke(colorModel, DEFAULT_THEME_NAME);
+        }
+            
+        
+    
+    
+    }
+    
+    
     private static void extractColorsForModule (String name, Class provider) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
     {
         
diff --git a/src/org/idp/laf/TitanLookAndFeel.java b/src/org/idp/laf/TitanLookAndFeel.java
index 22b4b82..e494281 100644
--- a/src/org/idp/laf/TitanLookAndFeel.java
+++ b/src/org/idp/laf/TitanLookAndFeel.java
@@ -5,12 +5,18 @@
  */
 package org.idp.laf;
 
+import java.util.prefs.Preferences;
+import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.plaf.metal.MetalLookAndFeel;
 import static javax.swing.plaf.metal.MetalLookAndFeel.getCurrentTheme;
 import static javax.swing.plaf.metal.MetalLookAndFeel.setCurrentTheme;
+import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
+import org.openide.util.NbPreferences;
+import org.openide.windows.WindowManager;
 
 /**
  * @author Edward M. Kagan <pagan@idp-crew.com>
@@ -19,9 +25,63 @@ public class TitanLookAndFeel  extends MetalLookAndFeel {
     
     public static void self_install ()
     {
+        UIManager.LookAndFeelInfo[] installedLookAndFeels = UIManager.getInstalledLookAndFeels();
+        for (UIManager.LookAndFeelInfo lafi : installedLookAndFeels)
+        {
+            String laf_name = NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
+            if (lafi.getName().equals(laf_name))
+            {
+                System.out.println("LAF Persist - no install.");
+                return;
+            }
+        }
+        System.out.print("NO LAF - installing... ");
         UIManager.installLookAndFeel(new UIManager.LookAndFeelInfo( NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN"), TitanLookAndFeel.class.getName()) );
+        System.out.println("OK");
+        
+        System.out.print("Applying LAf... ");
+        Preferences prefs = NbPreferences.root().node( "laf" ); //NOI18N
+        prefs.put( "laf", TitanLookAndFeel.class.getName() ); //NOI18N
+        System.out.println("OK");
     }
 
+    public static void self_remove ()
+    {
+        UIManager.LookAndFeelInfo[] installedLookAndFeels = UIManager.getInstalledLookAndFeels();
+        
+        for (UIManager.LookAndFeelInfo lafi : installedLookAndFeels)
+        {
+            String laf_name = NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
+            if (lafi.getName().equals(laf_name))
+            {
+                System.out.print("LAF Persist - removing...");
+                int i = 0;
+                UIManager.LookAndFeelInfo[] toSet = new UIManager.LookAndFeelInfo[installedLookAndFeels.length - 1];
+                for (UIManager.LookAndFeelInfo copy : installedLookAndFeels)
+                {
+                    if (!copy.getName().equals(laf_name))
+                    {
+                        toSet[i] = copy;
+                        i++;
+                    }
+                }
+                UIManager.setInstalledLookAndFeels(toSet);
+                System.out.println("OK");
+                System.out.print("Setting Metal theme by default...");
+                try {
+                    UIManager.setLookAndFeel(MetalLookAndFeel.class.getName());
+                    System.out.print("OK");
+                } catch (Exception ex) {
+                    Exceptions.printStackTrace(ex);
+                    System.out.print("FAIL");
+                } 
+                return;
+            }
+        }
+        
+        System.out.println("NO LAF - nothing to remove.");
+    }
+    
       @Override
     public String getName() {
         return NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
diff --git a/src/org/idp/laf/TitanTheme.java b/src/org/idp/laf/TitanTheme.java
index 462bc30..adcf12c 100644
--- a/src/org/idp/laf/TitanTheme.java
+++ b/src/org/idp/laf/TitanTheme.java
@@ -10,6 +10,7 @@ import javax.swing.UIDefaults;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.metal.MetalTheme;
+import org.openide.util.NbBundle;
 
 /**
  * @author Edward M. Kagan <pagan@idp-crew.com>
@@ -58,7 +59,7 @@ public class TitanTheme  extends MetalTheme {
     
     @Override
     public String getName() {
-        return "[idP!] Crew Titan Theme";
+        return NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
     }
 
     // FUCKERS - it's not obligatory to override this - IDIOTS!!!

From 92ebe56348957ba5dd3402b052cd826e4cb8a341 Mon Sep 17 00:00:00 2001
From: Wizard Atman <atman@idp-crew.com>
Date: Fri, 10 Apr 2015 02:17:57 +0400
Subject: [PATCH 3/3] Checking netbeans 5.5 based solution

---
 src/org/idp/laf/Bundle.properties     |   1 -
 src/org/idp/laf/ColorTheme.java       | 158 +++++++++++++------------
 src/org/idp/laf/Installer.java        |  43 +++----
 src/org/idp/laf/Kernel.java           |  25 ++--
 src/org/idp/laf/TitanEditor.java      | 163 ++++++++++++++------------
 src/org/idp/laf/TitanLookAndFeel.java |  87 +++++++-------
 src/org/idp/laf/TitanTheme.java       |   2 +-
 7 files changed, 249 insertions(+), 230 deletions(-)

diff --git a/src/org/idp/laf/Bundle.properties b/src/org/idp/laf/Bundle.properties
index ab9c8c0..01516f3 100644
--- a/src/org/idp/laf/Bundle.properties
+++ b/src/org/idp/laf/Bundle.properties
@@ -2,5 +2,4 @@ OpenIDE-Module-Display-Category=Base IDE
 OpenIDE-Module-Long-Description=\
     This plugin was designed only to compose well readable and enoght radk theme for Netbeans, But day by day it was enlarging - and now it is what it is.
 OpenIDE-Module-Name=[idP!] Crew LAF
-LBL_TITAN=[idP!] Titan
 OpenIDE-Module-Short-Description=Editor for Netbeans Metal Look and Feel
diff --git a/src/org/idp/laf/ColorTheme.java b/src/org/idp/laf/ColorTheme.java
index 0d55813..94b30fb 100644
--- a/src/org/idp/laf/ColorTheme.java
+++ b/src/org/idp/laf/ColorTheme.java
@@ -18,7 +18,7 @@ public class ColorTheme {
 
 // <editor-fold desc="annotations" defaultstate="collapsed">
 private static final AttributeSetConfigured [] annotations = {
-    new AttributeSetConfigured ("debugger-mixed_BP", new Color (252, 157, 159, 255), null, null, true, true, false, new Color (252, 157, 159, 255), new Color (252, 157, 159, 255), null, null, null), 
+        new AttributeSetConfigured ("debugger-mixed_BP", new Color (252, 157, 159, 255), null, null, true, true, false, new Color (252, 157, 159, 255), new Color (252, 157, 159, 255), null, null, null), 
     new AttributeSetConfigured ("Dbx_Bpt_cmpx_hit_dis", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("OtherThreads_DBP", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("stopwatchProfilingPoint", new Color (180, 228, 252, 255), null, null, true, true, false, new Color (180, 228, 252, 255), new Color (180, 228, 252, 255), null, null, null), 
@@ -44,107 +44,107 @@ private static final AttributeSetConfigured [] annotations = {
     new AttributeSetConfigured ("debugger-PC_multi_DBPCBP", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("Dbx_Bpt_hit_dis", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("Dbx_Bpt_cmpx_broken_dis", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), new Color (220, 220, 216, 255), null, null, null), 
-    new AttributeSetConfigured ("CurrentExpressionLine_BP", new Color (233, 255, 230, 255), null, null, true, true, false, new Color (233, 255, 230, 255), null, null, null, null), 
+    new AttributeSetConfigured ("CurrentExpressionLine_BP", new Color (233, 255, 230, 255), null, null, true, true, false, null, new Color (233, 255, 230, 255), null, null, null), 
     new AttributeSetConfigured ("takeSnapshotProfilingPointD", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-is_overridden_combined_pseudo", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("DisabledClassBreakpoint", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-extended_specializes", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_cmpx_broken", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_cmpx_broken", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("debugger-PC_multi_BPCBP", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-spi-editor-hints-parser_annotation_hint_fixable", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_cmpx_dis", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("DisabledBreakpoint_stroke", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_cmpx_dis", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("DisabledBreakpoint_stroke", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("debugger-PC_CBP_broken", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("debugger-PC_multi_BPCBP_broken", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), new Color (189, 230, 170, 255), null, null, null), 
-    new AttributeSetConfigured ("CurrentPC2LinePart", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
+    new AttributeSetConfigured ("CurrentPC2LinePart", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("debugger-PC_mixedBP_broken", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("editor-bookmark", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("stopwatchProfilingPointD", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), new Color (220, 220, 216, 255), null, null, null), 
-    new AttributeSetConfigured ("CurrentPC2", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("debugger-PC_DBP", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("DisabledCondBreakpoint", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
+    new AttributeSetConfigured ("CurrentPC2", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("debugger-PC_DBP", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("DisabledCondBreakpoint", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("OtherThread", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("debugger-PC_DCBP", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
+    new AttributeSetConfigured ("debugger-PC_DCBP", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("FieldBreakpoint_stroke", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("debugger-multi_DBPCBP", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), new Color (220, 220, 216, 255), null, null, null), 
-    new AttributeSetConfigured ("Breakpoint", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_cmpx", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
+    new AttributeSetConfigured ("Breakpoint", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_cmpx", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-editor-annotations-implements-is-overridden-combined", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-xml-error", new Color (255, 0, 255, 255), null, null, true, true, false, new Color (255, 0, 255, 255), new Color (255, 0, 255, 255), null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_cmpx_hit_broken_dis", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("CallSite", new Color (231, 225, 239, 255), null, null, true, true, false, new Color (231, 225, 239, 255), null, null, null, null), 
-    new AttributeSetConfigured ("debugger-PC_BP_broken", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("debugger-PC_DBP_stroke", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_broken", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("OtherThread_BP_broken", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("OtherThreads_PC_BP", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Breakpoint_broken", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_compound_hit", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_hit_broken_dis", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_cmpx_hit", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_cmpx_hit_broken_dis", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("CallSite", new Color (231, 225, 239, 255), null, null, true, true, false, null, new Color (231, 225, 239, 255), null, null, null), 
+    new AttributeSetConfigured ("debugger-PC_BP_broken", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("debugger-PC_DBP_stroke", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_broken", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("OtherThread_BP_broken", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("OtherThreads_PC_BP", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("Breakpoint_broken", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_compound_hit", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_hit_broken_dis", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_cmpx_hit", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-is_overridden_combined", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_dis", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_hit", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_dis", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_hit", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("DisabledFieldBreakpoint", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("OtherThread_DBP", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
+    new AttributeSetConfigured ("OtherThread_DBP", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("DisabledFieldBreakpoint_stroke", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-overrides", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("loadgenProfilingPoint", new Color (180, 228, 252, 255), null, null, true, true, false, new Color (180, 228, 252, 255), null, null, null, null), 
-    new AttributeSetConfigured ("CurrentExpressionLine_CBP", new Color (233, 255, 230, 255), null, null, true, true, false, new Color (233, 255, 230, 255), null, null, null, null), 
-    new AttributeSetConfigured ("debugger-PC_CBP", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("DisabledBreakpoint", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("loadgenProfilingPointD", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("loadgenProfilingPoint", new Color (180, 228, 252, 255), null, null, true, true, false, null, new Color (180, 228, 252, 255), null, null, null), 
+    new AttributeSetConfigured ("CurrentExpressionLine_CBP", new Color (233, 255, 230, 255), null, null, true, true, false, null, new Color (233, 255, 230, 255), null, null, null), 
+    new AttributeSetConfigured ("debugger-PC_CBP", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("DisabledBreakpoint", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("loadgenProfilingPointD", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-spi-editor-hints-parser_annotation_todo_fixable", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("OtherThreads", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-spi-editor-hints-parser_annotation_warn_fixable", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-spi-editor-hints-parser_annotation_err_fixable", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-versioning-annotate-Annotation", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-spi-editor-hints-parser_annotation_verifier", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("debugger-mixed_BP_broken", new Color (0, 0, 255, 255), null, null, true, true, false, new Color (0, 0, 255, 255), null, null, null, null), 
+    new AttributeSetConfigured ("debugger-mixed_BP_broken", new Color (0, 0, 255, 255), null, null, true, true, false, null, new Color (0, 0, 255, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-subversion-Annotation", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-specializes", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-editor-annotations-implements", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("DisabledMethodBreakpoint_stroke", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("CurrentPC", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_compound", new Color (252, 157, 159, 255), null, null, true, true, false, new Color (252, 157, 159, 255), null, null, null, null), 
+    new AttributeSetConfigured ("CurrentPC", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_compound", new Color (252, 157, 159, 255), null, null, true, true, false, null, new Color (252, 157, 159, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-editor-annotations-override-is-overridden-combined", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("OtherThread_BP", new Color (255, 0, 255, 255), null, null, true, true, false, new Color (255, 0, 255, 255), null, null, null, null), 
+    new AttributeSetConfigured ("OtherThread_BP", new Color (255, 0, 255, 255), null, null, true, true, false, null, new Color (255, 0, 255, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-editor-annotations-is_overridden", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-is_overridden_pseudo", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("debugger-multi_BPCBP", new Color (0, 0, 255, 255), null, null, true, true, false, new Color (0, 0, 255, 255), null, null, null, null), 
-    new AttributeSetConfigured ("debugger-PC_DCBP_stroke", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("resetResultsProfilingPointD", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("CurrentExpressionLine_DCBP", new Color (233, 255, 230, 255), null, null, true, true, false, new Color (233, 255, 230, 255), null, null, null, null), 
+    new AttributeSetConfigured ("debugger-multi_BPCBP", new Color (0, 0, 255, 255), null, null, true, true, false, null, new Color (0, 0, 255, 255), null, null, null), 
+    new AttributeSetConfigured ("debugger-PC_DCBP_stroke", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("resetResultsProfilingPointD", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("CurrentExpressionLine_DCBP", new Color (233, 255, 230, 255), null, null, true, true, false, null, new Color (233, 255, 230, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-git-Annotation", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-extended_is_specialized", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("CurrentExpressionLine_DBP", new Color (233, 255, 230, 255), null, null, true, true, false, new Color (233, 255, 230, 255), null, null, null, null), 
-    new AttributeSetConfigured ("org-netbeans-modules-cnd-cpp-parser_annotation_err", null, null, new Color (255, 0, 0, 255), false, true, true, null, null, new Color (255, 0, 0, 255), null, null), 
+    new AttributeSetConfigured ("CurrentExpressionLine_DBP", new Color (233, 255, 230, 255), null, null, true, true, false, null, new Color (233, 255, 230, 255), null, null, null), 
+    new AttributeSetConfigured ("org-netbeans-modules-cnd-cpp-parser_annotation_err", null, null, null, false, true, false, null, null, new Color (255, 0, 0, 255), null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-editor-annotations-overrides", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("takeSnapshotProfilingPoint", new Color (180, 228, 252, 255), null, null, true, true, false, new Color (180, 228, 252, 255), null, null, null, null), 
+    new AttributeSetConfigured ("takeSnapshotProfilingPoint", new Color (180, 228, 252, 255), null, null, true, true, false, null, new Color (180, 228, 252, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-spi-editor-hints-parser_annotation_todo", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-overrides_pseudo", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("debugger-PC_mixedBP", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
+    new AttributeSetConfigured ("debugger-PC_mixedBP", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-spi-editor-hints-parser_annotation_verifier_fixable", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_hit_broken", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_hit_broken", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-spi-editor-hints-parser_annotation_err", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("CondBreakpoint_broken", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
+    new AttributeSetConfigured ("CondBreakpoint_broken", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-editor-annotations-implements-has-implementations-combined", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("CurrentExpression", new Color (209, 255, 188, 255), null, null, true, true, false, new Color (209, 255, 188, 255), null, null, null, null), 
-    new AttributeSetConfigured ("CurrentPC2_BP", new Color (255, 0, 255, 255), null, null, true, true, false, new Color (255, 0, 255, 255), null, null, null, null), 
-    new AttributeSetConfigured ("debugger-PC_BP_stroke", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
+    new AttributeSetConfigured ("CurrentExpression", new Color (209, 255, 188, 255), null, null, true, true, false, null, new Color (209, 255, 188, 255), null, null, null), 
+    new AttributeSetConfigured ("CurrentPC2_BP", new Color (255, 0, 255, 255), null, null, true, true, false, null, new Color (255, 0, 255, 255), null, null, null), 
+    new AttributeSetConfigured ("debugger-PC_BP_stroke", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-is_specialized", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("debugger-multi_BPCBP_broken", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("DisabledCondBreakpoint_stroke", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("debugger-PC_BP", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Breakpoint_stroke", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
+    new AttributeSetConfigured ("debugger-multi_BPCBP_broken", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("DisabledCondBreakpoint_stroke", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("debugger-PC_BP", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
+    new AttributeSetConfigured ("Breakpoint_stroke", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-highligh-semantic-markoccurrences", null, null, null, false, true, false, null, null, null, null, null), 
     new AttributeSetConfigured ("ClassBreakpoint", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("OtherThread_PC_BP", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
+    new AttributeSetConfigured ("OtherThread_PC_BP", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("DisabledClassBreakpoint_stroke", null, null, null, false, true, false, null, null, null, null, null), 
-    new AttributeSetConfigured ("CurrentExpressionLine", new Color (233, 255, 230, 255), null, null, true, true, false, new Color (233, 255, 230, 255), null, null, null, null), 
-    new AttributeSetConfigured ("Dbx_Bpt_broken_dis", new Color (220, 220, 216, 255), null, null, true, true, false, new Color (220, 220, 216, 255), null, null, null, null), 
-    new AttributeSetConfigured ("CurrentPCLinePart", new Color (189, 230, 170, 255), null, null, true, true, false, new Color (189, 230, 170, 255), null, null, null, null), 
+    new AttributeSetConfigured ("CurrentExpressionLine", new Color (233, 255, 230, 255), null, null, true, true, false, null, new Color (233, 255, 230, 255), null, null, null), 
+    new AttributeSetConfigured ("Dbx_Bpt_broken_dis", new Color (220, 220, 216, 255), null, null, true, true, false, null, new Color (220, 220, 216, 255), null, null, null), 
+    new AttributeSetConfigured ("CurrentPCLinePart", new Color (189, 230, 170, 255), null, null, true, true, false, null, new Color (189, 230, 170, 255), null, null, null), 
     new AttributeSetConfigured ("org-netbeans-modules-cnd-navigation-is_overridden", null, null, null, false, true, false, null, null, null, null, null)
 };
 // </editor-fold>
@@ -185,15 +185,15 @@ private static final AttributeSetConfigured [] lang_Java = {
     new AttributeSetConfigured ("mark-occurrences", new Color (73, 72, 66, 255), null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-abstract", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("string", null, null, null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("javadoc-identifier", null, new Color (199, 98, 139, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("javadoc-identifier", null, new Color (128, 128, 128, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-public", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-class", null, new Color (187, 129, 219, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-unused", null, null, null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("mod-method-declaration", null, new Color (88, 88, 196, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-interface-declaration", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("mod-method-declaration", null, new Color (88, 88, 196, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("operator", null, null, null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("literal", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("keyword-directive", null, new Color (230, 31, 91, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("literal", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("number", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("character", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-parameter", null, new Color (251, 152, 32, 255), null, null, null, null, null, null, null, null, null), 
@@ -204,17 +204,17 @@ private static final AttributeSetConfigured [] lang_Java = {
     new AttributeSetConfigured ("string-escape-invalid", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("keyword", null, new Color (234, 82, 128, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-local-variable", null, null, null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("identifier", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("identifier", null, new Color (0, 255, 255, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-field", null, new Color (255, 255, 255, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("javadoc-tag", null, new Color (255, 0, 102, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-method", null, new Color (141, 141, 222, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-annotation-type-declaration", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-interface", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-protected", null, null, null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("separator", null, null, null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("mod-constructor-declaration", null, new Color (62, 176, 176, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("character-escape-invalid", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("mod-constructor-declaration", null, new Color (62, 176, 176, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("html-tag", null, new Color (153, 153, 255, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("separator", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-enum", null, new Color (187, 129, 219, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-local-variable-declaration", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-parameter-declaration", null, new Color (251, 151, 31, 255), null, null, null, null, null, null, null, null, null), 
@@ -227,13 +227,14 @@ private static final AttributeSetConfigured [] lang_Java = {
     new AttributeSetConfigured ("comment", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("whitespace", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-constructor", null, new Color (120, 212, 212, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("errors", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("mod-field-declaration", null, new Color (255, 255, 255, 255), null, null, null, null, null, null, null, null, null)
 };
 // </editor-fold>
 
 // <editor-fold desc="C++" defaultstate="collapsed">
 private static final AttributeSetConfigured [] lang_CPP = {
-    new AttributeSetConfigured ("string", null, null, null, null, null, null, null, null, null, null, null), 
+      new AttributeSetConfigured ("string", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("pragma-omp-keyword-directive", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("preprocessor", null, new Color (0, 155, 0, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("cc-highlighting-function", null, null, null, null, null, null, null, null, null, null, null), 
@@ -311,24 +312,37 @@ private static final AttributeSetConfigured [] lang_C = {
 
 // <editor-fold desc="All Languages" defaultstate="collapsed">
     private static final AttributeSetConfigured [] lang_All_Languages = {
-    new AttributeSetConfigured ("identifier", null, new Color (255, 255, 255, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("markup-attribute", null, new Color (0, 124, 0, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("private", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("string", null, new Color (255, 255, 90, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("deprecated", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("error", new Color (255, 0, 0, 255), new Color (255, 255, 255, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("interface", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("entity-reference", null, new Color (255, 175, 175, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("operator", null, new Color (187, 187, 187, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("number", null, new Color (150, 233, 82, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("default", new Color (16, 16, 16, 255), new Color (228, 228, 228, 255), null, null, null, null, null, null, null, false, false), 
+    new AttributeSetConfigured ("protected", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("public", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("method-parameter", null, new Color (160, 96, 1, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("warning", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("keyword", null, new Color (230, 31, 91, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("local-variable", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("class", null, null, null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("identifier", null, new Color (255, 255, 255, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("static", null, null, null, null, null, null, null, null, null, false, true), 
     new AttributeSetConfigured ("method", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("markup-element", null, new Color (255, 200, 0, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("constructor", null, null, null, null, null, null, null, null, null, true, false), 
     new AttributeSetConfigured ("markup-attribute-value", null, null, null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("error", new Color (255, 0, 0, 255), new Color (255, 255, 255, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("abstract", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("separator", null, new Color (187, 187, 187, 255), null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("entity-reference", null, new Color (255, 175, 175, 255), null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("operator", null, new Color (187, 187, 187, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("url", null, null, null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("number", null, new Color (150, 233, 82, 255), null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("default", new Color (16, 16, 16, 255), new Color (228, 228, 228, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("enum", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("field", null, new Color (9, 134, 24, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("char", null, new Color (255, 255, 145, 255), null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("warning", null, null, null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("comment", null, new Color (117, 113, 94, 255), null, null, null, null, null, null, null, null, null), 
-    new AttributeSetConfigured ("keyword", null, new Color (230, 31, 91, 255), null, null, null, null, null, null, null, null, null), 
+    new AttributeSetConfigured ("unused", null, new Color (128, 128, 128, 255), null, null, null, null, null, null, null, null, null), 
     new AttributeSetConfigured ("whitespace", null, null, null, null, null, null, null, null, null, null, null)
 };
 // </editor-fold>
diff --git a/src/org/idp/laf/Installer.java b/src/org/idp/laf/Installer.java
index 836c957..bf23974 100644
--- a/src/org/idp/laf/Installer.java
+++ b/src/org/idp/laf/Installer.java
@@ -7,7 +7,9 @@ package org.idp.laf;
 
 import java.util.prefs.Preferences;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import org.openide.modules.ModuleInstall;
+import org.openide.util.NbBundle;
 import org.openide.util.NbPreferences;
 import org.openide.windows.WindowManager;
 
@@ -16,7 +18,7 @@ import org.openide.windows.WindowManager;
  */
 public class Installer extends ModuleInstall 
 {
-
+    
     @Override
     public void restored() {
         
@@ -26,11 +28,20 @@ public class Installer extends ModuleInstall
             public void run()
             {
                 Kernel.load_kernel();
+                
             }
         });
         
-        final Preferences prefs = NbPreferences.root().node( "laf" ); //NOI18N
+//        System.out.println(">>>>>>>>>>>>>>> L&F = " + UIManager.getLookAndFeel().getName());
+//        
+////        if (UIManager.getLookAndFeel().getName().equals(NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN")))
+////        {
+//            
+//        //}
         
+//        
+//        
+        final Preferences prefs = NbPreferences.root().node( "laf" ); //NOI18N
         if( !prefs.getBoolean("idp.titan_editor.installed", false) ) //NOI18N
         { 
             WindowManager.getDefault().invokeWhenUIReady( new Runnable() 
@@ -52,26 +63,18 @@ public class Installer extends ModuleInstall
         
     }
     
-    
-
     @Override
     public void validate() throws IllegalStateException 
     {   
-        System.out.println(">>>> Validate");
-      //  Preferences prefs = NbPreferences.root().node( "laf" ); //NOI18N
-      //  if( !prefs.getBoolean("idp.titan.installed", false) ) { //NOI18N
-      //      prefs.put( "laf", TitanLookAndFeel.class.getName() ); //NOI18N
-      //  }
-      //  prefs.putBoolean("idp.titan.installed", true ); //NOI18N
-        TitanLookAndFeel.self_install();
-    }
-
-    @Override
-    public void uninstalled() {
-        System.out.println(">>>> uninstalled" );
-        TitanLookAndFeel.self_remove();
-//  super.uninstalled(); //To change body of generated methods, choose Tools | Templates.
-        
+        if (TitanLookAndFeel.self_install())
+        {
+            System.out.print("Setting up anti-aliasing hints to conf file...");
+            if (Kernel.setup_font_antialiaing_hints())
+            {
+                System.err.println("FAIL");
+                return;
+            }
+            System.out.println("OK");
+        }   
     }
-    
 }
diff --git a/src/org/idp/laf/Kernel.java b/src/org/idp/laf/Kernel.java
index 4eaee85..d3eb908 100644
--- a/src/org/idp/laf/Kernel.java
+++ b/src/org/idp/laf/Kernel.java
@@ -54,11 +54,9 @@ public class Kernel {
     
     public static void load_kernel ()
     {
-        if (prepare_titan_laf ())
+        if (UIManager.getLookAndFeel().getName().equals("[idP!] Titan")) //NOI18N
         {
             String nb_etc = retrieve_netbeans_etc_dir();
-            setup_font_antialiaing_hints(nb_etc);
-            
             String cfh_dir = retrieve_app_folder();
             boolean a = (new File (cfh_dir).mkdirs());
             load_setup (cfh_dir);
@@ -73,26 +71,23 @@ public class Kernel {
         }
         else
         {
-//            String message = "\"Titan\" Look and Feel is not selected"
-//                    + " - no modifications done. Follow your ugly way of live.";
-//            JOptionPane.showMessageDialog(new JFrame(), message, "Titan is not selected!",
-//            JOptionPane.ERROR_MESSAGE);
             System.err.println("\"Titan\" Look and Feel is not selected"
                     + " - no modifications done. Follow your ugly way of live.");
         }
     }
     
-    private static boolean prepare_titan_laf ()
-    {   
-     //   UIManager.put("nb.forceui", true);
-     //   UIManager.put("netbeans.plaf.disable.ui.customizations", false);
-        return UIManager.getLookAndFeel().getName().equals(NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN"));
-    }
+//    private static boolean prepare_titan_laf ()
+//    {   
+//     //   UIManager.put("nb.forceui", true);
+//     //   UIManager.put("netbeans.plaf.disable.ui.customizations", false);
+//        return ;
+//    }
     
-    private static boolean setup_font_antialiaing_hints (String nb_etc)
+    public static boolean setup_font_antialiaing_hints ()
     {
         try 
-        {    
+        {   
+            String nb_etc = retrieve_netbeans_etc_dir ();
             System.setProperty("awt.useSystemAAFontSettings","lcd");
             System.setProperty("swing.aatext", "true");
          
diff --git a/src/org/idp/laf/TitanEditor.java b/src/org/idp/laf/TitanEditor.java
index 0e61719..2999137 100644
--- a/src/org/idp/laf/TitanEditor.java
+++ b/src/org/idp/laf/TitanEditor.java
@@ -91,8 +91,8 @@ public class TitanEditor {
     private static Object const_WaveUnderlineColor;
     private static Object colorModel;
     
-    private static final String DEFAULT_THEME_NAME = "NetBeans";   //NOI18N
-    private static final String TITAN_THEME_NAME = NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
+    private static final String DEFAULT_THEME_NAME = "NetBeans 5.5";   //NOI18N
+    //private static final String TITAN_THEME_NAME = NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
     
     private static Class provider_GIT = null;
     private static Class provider_SVN = null;
@@ -294,49 +294,50 @@ public class TitanEditor {
         return false;
     }
     
-    private static void setup_theme () throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
-    {
-        String current_profile = (String) getCurrentProfile.invoke( colorModel, new Object[0] );               
- 
-            Set<String> profile_set = (Set<String>) getProfiles.invoke( colorModel, new Object[0] );
-            boolean contain_target_theme = false;
-            for (String str : profile_set)
-            {
-         //       System.out.println("> " + str);
-                if (str.equals(TITAN_THEME_NAME)) contain_target_theme = true;
-            }
-            
-            if (!contain_target_theme)
-            {
-                // Ugly dublication routine, sorry NB developers...
-                setCurrentProfile.invoke(colorModel, DEFAULT_THEME_NAME);
-            }
-            
-            setCurrentProfile.invoke(colorModel, TITAN_THEME_NAME);
-        //}
-    }
-    
-    public static void remove_editor () throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
-    {
-        Set<String> profile_set = (Set<String>) getProfiles.invoke( colorModel, new Object[0] );
-        boolean contain_target_theme = false;
-        for (String str : profile_set)
-        {
-                if (str.equals(TITAN_THEME_NAME)) contain_target_theme = true;
-        }
-            
-        if (contain_target_theme)
-        {
-            setCurrentProfile.invoke(colorModel, TITAN_THEME_NAME);
-            
-            
-            setCurrentProfile.invoke(colorModel, DEFAULT_THEME_NAME);
-        }
-            
-        
+//    private static String setup_theme () throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
+//    {
+//   //     String current_profile 
+//// 
+////            Set<String> profile_set = (Set<String>) getProfiles.invoke( colorModel, new Object[0] );
+////            //boolean contain_target_theme = false;
+//////            for (String str : profile_set)
+//////            {
+//////               System.out.println("> " + str);
+////////                if (str.equals(TITAN_THEME_NAME)) contain_target_theme = true;
+////            }
+////            
+////            if (!contain_target_theme)
+////            {
+//                // Ugly dublication routine, sorry NB developers...
+//               
+//          //  }
+//            
+//          //  setCurrentProfile.invoke(colorModel, TITAN_THEME_NAME);
+//        //}
+//                return current_profile;
+//    }
     
-    
-    }
+//    public static void remove_editor () throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
+//    {
+//        Set<String> profile_set = (Set<String>) getProfiles.invoke( colorModel, new Object[0] );
+//        boolean contain_target_theme = false;
+//        for (String str : profile_set)
+//        {
+//                if (str.equals(TITAN_THEME_NAME)) contain_target_theme = true;
+//        }
+//            
+//        if (contain_target_theme)
+//        {
+//            setCurrentProfile.invoke(colorModel, TITAN_THEME_NAME);
+//            
+//            
+//            setCurrentProfile.invoke(colorModel, DEFAULT_THEME_NAME);
+//        }
+//            
+//        
+//    
+//    
+//    }
     
     
     private static void extractColorsForModule (String name, Class provider) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException
@@ -400,15 +401,16 @@ public class TitanEditor {
         if (!pre_load()) return;
         
         try {    
-            setup_theme ();
+            
+         //   String swith_back = (String) getCurrentProfile.invoke( colorModel, new Object[0] ); 
             
             if (no_load)
             {
-                Collection<AttributeSet> annotations = (Collection<AttributeSet>) getAnnotations.invoke(colorModel, TITAN_THEME_NAME);
+                Collection<AttributeSet> annotations = (Collection<AttributeSet>) getAnnotations.invoke(colorModel, DEFAULT_THEME_NAME);
                 process_set ("annotations", annotations, true);
                 
                 
-                Collection<AttributeSet> highlightings = (Collection<AttributeSet>) getHighlightings.invoke(colorModel, TITAN_THEME_NAME);
+                Collection<AttributeSet> highlightings = (Collection<AttributeSet>) getHighlightings.invoke(colorModel, DEFAULT_THEME_NAME);
                 process_set ("highlightings", highlightings, false);
 
                 Object languages = getLanguages.invoke( colorModel, new Object[0] );
@@ -421,7 +423,7 @@ public class TitanEditor {
                         str.equals("C++") ||
                         str.equals("C"))
                     {
-                        Collection<AttributeSet> category = (Collection<AttributeSet>) getCategories.invoke(colorModel, TITAN_THEME_NAME, str);
+                        Collection<AttributeSet> category = (Collection<AttributeSet>) getCategories.invoke(colorModel, DEFAULT_THEME_NAME, str);
                         process_set (str, category, false);
                     }   
                 }
@@ -436,39 +438,48 @@ public class TitanEditor {
             }
             else
             {
-                Collection<AttributeSet> annotations = (Collection<AttributeSet>) getAnnotations.invoke(colorModel, TITAN_THEME_NAME);
-                Collection<AttributeSet> annotations_upd = apply_set ("annotations", annotations, true);
-                setAnnotations.invoke(colorModel, TITAN_THEME_NAME, annotations_upd);
-                
-                Collection<AttributeSet> highlightings = (Collection<AttributeSet>) getHighlightings.invoke(colorModel, TITAN_THEME_NAME);
-                Collection<AttributeSet> highlightings_upd = apply_set ("highlightings", highlightings, false);
-                setHighlightings.invoke(colorModel, TITAN_THEME_NAME, highlightings_upd);
+           
+                   
+                    
+                    setCurrentProfile.invoke(colorModel, DEFAULT_THEME_NAME);
+                    Collection<AttributeSet> annotations = (Collection<AttributeSet>) getAnnotations.invoke(colorModel, DEFAULT_THEME_NAME);
+                    Collection<AttributeSet> annotations_upd = apply_set ("annotations", annotations, true);
+                    setAnnotations.invoke(colorModel, DEFAULT_THEME_NAME, annotations_upd);
 
-                Object languages = getLanguages.invoke( colorModel, new Object[0] );
-                Set<String> languages_set = (Set<String>) languages;
+                    Collection<AttributeSet> highlightings = (Collection<AttributeSet>) getHighlightings.invoke(colorModel, DEFAULT_THEME_NAME);
+                    Collection<AttributeSet> highlightings_upd = apply_set ("highlightings", highlightings, false);
+                    setHighlightings.invoke(colorModel, DEFAULT_THEME_NAME, highlightings_upd);
 
-                for (String str : languages_set)
-                {
-                    if (str.equals("All Languages") ||
-                        str.equals("Java") ||
-                        str.equals("C++") ||
-                        str.equals("C"))
+                    Object languages = getLanguages.invoke( colorModel, new Object[0] );
+                    Set<String> languages_set = (Set<String>) languages;
+
+                    for (String str : languages_set)
                     {
-                        Collection<AttributeSet> category = (Collection<AttributeSet>) getCategories.invoke(colorModel, TITAN_THEME_NAME, str);
-                        Collection<AttributeSet> category_upd = apply_set (str, category, false);
-                        setCategories.invoke(colorModel, TITAN_THEME_NAME, str, category_upd);
-                        
-                    }   
-                }
-                
-                applyColorForModule (provider_GIT, ColorTheme.GIT);
-                applyColorForModule (provider_SVN, ColorTheme.SVN);
-                applyColorForModule (provider_HG, ColorTheme.HG);
-                
-                applyColorForDiffModule ();
+                        if (str.equals("All Languages") ||
+                            str.equals("Java") ||
+                            str.equals("C++") ||
+                            str.equals("C"))
+                        {
+                            Collection<AttributeSet> category = (Collection<AttributeSet>) getCategories.invoke(colorModel, DEFAULT_THEME_NAME, str);
+                            Collection<AttributeSet> category_upd = apply_set (str, category, false);
+                            setCategories.invoke(colorModel, DEFAULT_THEME_NAME, str, category_upd);
+
+                        }   
+                    }
 
-                
+                    applyColorForModule (provider_GIT, ColorTheme.GIT);
+                    applyColorForModule (provider_SVN, ColorTheme.SVN);
+                    applyColorForModule (provider_HG, ColorTheme.HG);
+
+                    applyColorForDiffModule ();
+                    
+//                    if (!first_run)
+//                    {
+//                        setCurrentProfile.invoke(colorModel, swith_back);
+//                    }
             }
+            
+             
         } catch (IllegalAccessException ex) {
             Exceptions.printStackTrace(ex);
         } catch (IllegalArgumentException ex) {
diff --git a/src/org/idp/laf/TitanLookAndFeel.java b/src/org/idp/laf/TitanLookAndFeel.java
index e494281..f7c3fbc 100644
--- a/src/org/idp/laf/TitanLookAndFeel.java
+++ b/src/org/idp/laf/TitanLookAndFeel.java
@@ -6,85 +6,82 @@
 package org.idp.laf;
 
 import java.util.prefs.Preferences;
-import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.plaf.metal.MetalLookAndFeel;
 import static javax.swing.plaf.metal.MetalLookAndFeel.getCurrentTheme;
 import static javax.swing.plaf.metal.MetalLookAndFeel.setCurrentTheme;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.openide.util.NbPreferences;
-import org.openide.windows.WindowManager;
 
 /**
  * @author Edward M. Kagan <pagan@idp-crew.com>
  */
 public class TitanLookAndFeel  extends MetalLookAndFeel {
     
-    public static void self_install ()
+    public static boolean self_install ()
     {
         UIManager.LookAndFeelInfo[] installedLookAndFeels = UIManager.getInstalledLookAndFeels();
         for (UIManager.LookAndFeelInfo lafi : installedLookAndFeels)
         {
-            String laf_name = NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
+            String laf_name = "[idP!] Titan";  //NOI18N
             if (lafi.getName().equals(laf_name))
             {
                 System.out.println("LAF Persist - no install.");
-                return;
+                return false;
             }
         }
         System.out.print("NO LAF - installing... ");
-        UIManager.installLookAndFeel(new UIManager.LookAndFeelInfo( NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN"), TitanLookAndFeel.class.getName()) );
+        UIManager.installLookAndFeel(new UIManager.LookAndFeelInfo("[idP!] Titan" , TitanLookAndFeel.class.getName()) ); //NOI18N
         System.out.println("OK");
         
         System.out.print("Applying LAf... ");
         Preferences prefs = NbPreferences.root().node( "laf" ); //NOI18N
         prefs.put( "laf", TitanLookAndFeel.class.getName() ); //NOI18N
         System.out.println("OK");
+        return true;
     }
 
-    public static void self_remove ()
-    {
-        UIManager.LookAndFeelInfo[] installedLookAndFeels = UIManager.getInstalledLookAndFeels();
-        
-        for (UIManager.LookAndFeelInfo lafi : installedLookAndFeels)
-        {
-            String laf_name = NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
-            if (lafi.getName().equals(laf_name))
-            {
-                System.out.print("LAF Persist - removing...");
-                int i = 0;
-                UIManager.LookAndFeelInfo[] toSet = new UIManager.LookAndFeelInfo[installedLookAndFeels.length - 1];
-                for (UIManager.LookAndFeelInfo copy : installedLookAndFeels)
-                {
-                    if (!copy.getName().equals(laf_name))
-                    {
-                        toSet[i] = copy;
-                        i++;
-                    }
-                }
-                UIManager.setInstalledLookAndFeels(toSet);
-                System.out.println("OK");
-                System.out.print("Setting Metal theme by default...");
-                try {
-                    UIManager.setLookAndFeel(MetalLookAndFeel.class.getName());
-                    System.out.print("OK");
-                } catch (Exception ex) {
-                    Exceptions.printStackTrace(ex);
-                    System.out.print("FAIL");
-                } 
-                return;
-            }
-        }
-        
-        System.out.println("NO LAF - nothing to remove.");
-    }
+//    public static void self_remove ()
+//    {
+//        UIManager.LookAndFeelInfo[] installedLookAndFeels = UIManager.getInstalledLookAndFeels();
+//        
+//        for (UIManager.LookAndFeelInfo lafi : installedLookAndFeels)
+//        {
+//            System.out.println(">>>> " + lafi.getName());
+//            String laf_name = NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
+//            if (lafi.getName().equals(laf_name))
+//            {
+//                System.out.print("LAF Persist - removing...");
+//                int i = 0;
+//                UIManager.LookAndFeelInfo[] toSet = new UIManager.LookAndFeelInfo[installedLookAndFeels.length - 1];
+//                for (UIManager.LookAndFeelInfo copy : installedLookAndFeels)
+//                {
+//                    if (!copy.getName().equals(laf_name))
+//                    {
+//                        toSet[i] = copy;
+//                        i++;
+//                    }
+//                }
+//                UIManager.setInstalledLookAndFeels(toSet);
+//                System.out.println("OK");
+//                System.out.print("Setting Metal theme by default...");
+//                try {
+//                    UIManager.setLookAndFeel(MetalLookAndFeel.class.getName());
+//                    System.out.print("OK");
+//                } catch (Exception ex) {
+//                    System.out.print("FAIL");
+//                } 
+//                return;
+//            }
+//        }
+//        
+//        System.out.println("NO LAF - nothing to remove.");
+//    }
     
       @Override
     public String getName() {
-        return NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
+        return "[idP!] Titan";  //NOI18N
     }
 
     @Override
diff --git a/src/org/idp/laf/TitanTheme.java b/src/org/idp/laf/TitanTheme.java
index adcf12c..296eec2 100644
--- a/src/org/idp/laf/TitanTheme.java
+++ b/src/org/idp/laf/TitanTheme.java
@@ -59,7 +59,7 @@ public class TitanTheme  extends MetalTheme {
     
     @Override
     public String getName() {
-        return NbBundle.getMessage(TitanLookAndFeel.class, "LBL_TITAN");
+        return "[idP!] Titan"; //NOI18N
     }
 
     // FUCKERS - it's not obligatory to override this - IDIOTS!!!