Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 158)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 163)
@@ -15,4 +15,6 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.FileInputStream;
@@ -37,4 +39,7 @@
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.event.ChangeEvent;
+import javax.swing.JColorChooser;
+import javax.swing.colorchooser.AbstractColorChooserPanel;
+import javax.swing.JPanel;
 import scriptbuilder.gui.panels.IncidentTimelinePanel;
 import scriptbuilder.structures.ScriptEvent;
@@ -2203,5 +2208,21 @@
     private void btnChooseColorActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnChooseColorActionPerformed
         //For whatever reason, this causes the incident properties frame to be hidden
+        //this needs to be changed to edit only a certain number of colors, perhaps only the colors that are specified by java.awt.Color 
+        
         Color newColor = incidentColorChooser.showDialog(this, "Incident Color", incidentColorField.getBackground());
+//        Color newColor = Color.BLUE;
+//        JColorChooser chooser = (new JColorChooser(incidentColorField.getBackground()));
+//        AbstractColorChooserPanel[] panels = chooser.getChooserPanels();
+//        for(AbstractColorChooserPanel panel:panels)
+//        {
+//            System.out.println(panel.getDisplayName());
+//        }
+//        chooser.setPreviewPanel(new JPanel());
+//               JColorChooser.createDialog(
+//                   this.getParent(), 
+//                   "Choose an Incident Color", 
+//                   true, 
+//                   chooser,null,null  
+//                ).setVisible(true);
         if (newColor != null)
         {