Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 78)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 81)
@@ -306,24 +306,24 @@
         timelinesScrollPane = new javax.swing.JScrollPane();
         timelineTickPanel = new scriptbuilder.gui.panels.TimelineTickPanel();
-        incidentTimelinePanel1 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentTimelinePanel2 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentTimelinePanel8 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentTimelinePanel3 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentTimelinePanel6 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentTimelinePanel5 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentTimelinePanel4 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentTimelinePanel7 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentTimelinePanel10 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentTimelinePanel9 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentNumberPanel1 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
-        incidentNumberPanel2 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
-        incidentNumberPanel3 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
-        incidentNumberPanel4 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
-        incidentNumberPanel5 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
-        incidentNumberPanel6 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
-        incidentNumberPanel7 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
-        incidentNumberPanel8 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
-        incidentNumberPanel9 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
-        incidentNumberPanel10 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
+        incidentTimelinePanel1 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentTimelinePanel2 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentTimelinePanel8 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentTimelinePanel3 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentTimelinePanel6 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentTimelinePanel5 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentTimelinePanel4 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentTimelinePanel7 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentTimelinePanel10 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentTimelinePanel9 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentNumberPanel1 = new scriptbuilder.gui.panels.IncidentNumberPanel();
+        incidentNumberPanel2 = new scriptbuilder.gui.panels.IncidentNumberPanel();
+        incidentNumberPanel3 = new scriptbuilder.gui.panels.IncidentNumberPanel();
+        incidentNumberPanel4 = new scriptbuilder.gui.panels.IncidentNumberPanel();
+        incidentNumberPanel5 = new scriptbuilder.gui.panels.IncidentNumberPanel();
+        incidentNumberPanel6 = new scriptbuilder.gui.panels.IncidentNumberPanel();
+        incidentNumberPanel7 = new scriptbuilder.gui.panels.IncidentNumberPanel();
+        incidentNumberPanel8 = new scriptbuilder.gui.panels.IncidentNumberPanel();
+        incidentNumberPanel9 = new scriptbuilder.gui.panels.IncidentNumberPanel();
+        incidentNumberPanel10 = new scriptbuilder.gui.panels.IncidentNumberPanel();
         zoomSlider = new javax.swing.JSlider();
         zoomInIcon = new javax.swing.JLabel();
@@ -2042,26 +2042,26 @@
     private javax.swing.JFrame incidentFrame;
     private javax.swing.JMenu incidentMenu;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel1;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel10;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel2;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel3;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel4;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel5;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel6;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel7;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel8;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel9;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel1;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel10;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel2;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel3;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel4;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel5;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel6;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel7;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel8;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel9;
     private javax.swing.JButton incidentOkButton;
     private javax.swing.JPopupMenu incidentPopupMenu;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel1;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel10;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel2;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel3;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel4;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel5;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel6;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel7;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel8;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel9;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel1;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel10;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel2;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel3;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel4;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel5;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel6;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel7;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel8;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel9;
     private javax.swing.JButton jButton1;
     private javax.swing.JButton jButton2;
Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form	(revision 55)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.form	(revision 81)
@@ -1058,5 +1058,5 @@
           </Layout>
           <SubComponents>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel1">
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel1">
               <Properties>
                 <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -1082,329 +1082,329 @@
               </Layout>
             </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel2">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel8">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel3">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel6">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel5">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel4">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel7">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel10">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel9">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel1">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel2">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel3">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel4">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel5">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel6">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel7">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel8">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel9">
-              <Properties>
-                <Property name="opaque" type="boolean" value="false"/>
-              </Properties>
-
-              <Layout>
-                <DimensionLayout dim="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-                <DimensionLayout dim="1">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                  </Group>
-                </DimensionLayout>
-              </Layout>
-            </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel10">
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel2">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel8">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel3">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel6">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel5">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel4">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel7">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel10">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel9">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel1">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel2">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel3">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel4">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel5">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel6">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel7">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel8">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel9">
+              <Properties>
+                <Property name="opaque" type="boolean" value="false"/>
+              </Properties>
+
+              <Layout>
+                <DimensionLayout dim="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+                <DimensionLayout dim="1">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                </DimensionLayout>
+              </Layout>
+            </Container>
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel10">
               <Properties>
                 <Property name="opaque" type="boolean" value="false"/>
Index: trunk/src/scriptbuilder/gui/application.properties
===================================================================
--- trunk/src/scriptbuilder/gui/application.properties	(revision 78)
+++ trunk/src/scriptbuilder/gui/application.properties	(revision 81)
@@ -1,5 +1,5 @@
-#Fri, 25 Aug 2017 15:10:59 -0700
+#Fri, 25 Aug 2017 15:31:58 -0700
 
 Application.revision=0
 
-Application.buildnumber=4
+Application.buildnumber=5
Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 78)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 81)
@@ -409,6 +409,6 @@
         timelinesScrollPane = new javax.swing.JScrollPane();
         timelineTickPanel = new scriptbuilder.gui.panels.TimelineTickPanel();
-        incidentTimelinePanel1 = new scriptbuilder.gui.panels.ScriptBuilderTimelinePanel();
-        incidentNumberPanel1 = new scriptbuilder.gui.panels.ScriptBuilderNumberPanel();
+        incidentTimelinePanel1 = new scriptbuilder.gui.panels.IncidentTimelinePanel();
+        incidentNumberPanel1 = new scriptbuilder.gui.panels.IncidentNumberPanel();
         scriptEventsPanel = new javax.swing.JPanel();
         scriptEventsPane = new javax.swing.JScrollPane();
@@ -1810,6 +1810,6 @@
     private javax.swing.JTextField incidentName;
     private javax.swing.JTextField incidentNumber;
-    private scriptbuilder.gui.panels.ScriptBuilderNumberPanel incidentNumberPanel1;
-    private scriptbuilder.gui.panels.ScriptBuilderTimelinePanel incidentTimelinePanel1;
+    private scriptbuilder.gui.panels.IncidentNumberPanel incidentNumberPanel1;
+    private scriptbuilder.gui.panels.IncidentTimelinePanel incidentTimelinePanel1;
     private javax.swing.JButton jButton1;
     private javax.swing.JButton jButton2;
Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.form
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.form	(revision 78)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.form	(revision 81)
@@ -563,5 +563,5 @@
           </Layout>
           <SubComponents>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderTimelinePanel" name="incidentTimelinePanel1">
+            <Container class="scriptbuilder.gui.panels.IncidentTimelinePanel" name="incidentTimelinePanel1">
               <Properties>
                 <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
@@ -587,5 +587,5 @@
               </Layout>
             </Container>
-            <Container class="scriptbuilder.gui.panels.ScriptBuilderNumberPanel" name="incidentNumberPanel1">
+            <Container class="scriptbuilder.gui.panels.IncidentNumberPanel" name="incidentNumberPanel1">
               <Properties>
                 <Property name="opaque" type="boolean" value="false"/>