diff --git a/binaries/jars/latest_development/intrace-agent.jar b/binaries/jars/latest_development/intrace-agent.jar
index 1ad2e98..928d79b 100644
Binary files a/binaries/jars/latest_development/intrace-agent.jar and b/binaries/jars/latest_development/intrace-agent.jar differ
diff --git a/binaries/jars/latest_development/intrace-ui.jar b/binaries/jars/latest_development/intrace-ui.jar
index ba14718..7a023f1 100644
Binary files a/binaries/jars/latest_development/intrace-ui.jar and b/binaries/jars/latest_development/intrace-ui.jar differ
diff --git a/intrace.ecl.feature/feature.xml b/intrace.ecl.feature/feature.xml
index b073936..3881b2d 100644
--- a/intrace.ecl.feature/feature.xml
+++ b/intrace.ecl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="intrace.ecl.feature"
       label="InTrace Eclipse Plugin"
-      version="0.17">
+      version="0.18">
 
    <description url="https://github.com/mchr3k/org.intrace/wiki">
       Enable launching Java Applications with the InTrace agent.
@@ -215,6 +215,6 @@ litigation.
          id="intrace.ecl"
          download-size="0"
          install-size="0"
-         version="0.17.0"/>
+         version="0.18.0"/>
 
 </feature>
diff --git a/intrace.ecl.plugin/META-INF/MANIFEST.MF b/intrace.ecl.plugin/META-INF/MANIFEST.MF
index e3eac1d..ce6fe97 100644
--- a/intrace.ecl.plugin/META-INF/MANIFEST.MF
+++ b/intrace.ecl.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: InTrace Eclipse
 Bundle-SymbolicName: intrace.ecl;singleton:=true
-Bundle-Version: 0.17
+Bundle-Version: 0.18
 Bundle-Activator: intrace.ecl.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/intrace.ecl.plugin/lib/intrace-agent.jar b/intrace.ecl.plugin/lib/intrace-agent.jar
index f318170..928d79b 100644
Binary files a/intrace.ecl.plugin/lib/intrace-agent.jar and b/intrace.ecl.plugin/lib/intrace-agent.jar differ
diff --git a/intrace.ecl.plugin/lib/intrace-ui-helper.jar b/intrace.ecl.plugin/lib/intrace-ui-helper.jar
index a431b7d..ec585d0 100644
Binary files a/intrace.ecl.plugin/lib/intrace-ui-helper.jar and b/intrace.ecl.plugin/lib/intrace-ui-helper.jar differ
diff --git a/intrace.ecl.plugin/src/intrace/ecl/ui/output/InTraceEditor.java b/intrace.ecl.plugin/src/intrace/ecl/ui/output/InTraceEditor.java
index 27e8ed9..fed7fd7 100644
--- a/intrace.ecl.plugin/src/intrace/ecl/ui/output/InTraceEditor.java
+++ b/intrace.ecl.plugin/src/intrace/ecl/ui/output/InTraceEditor.java
@@ -52,9 +52,12 @@ public class InTraceEditor extends EditorPart
     ITheme theme = workBench.getThemeManager().getCurrentTheme();
     ColorRegistry colreg = theme.getColorRegistry();
 
-    Color c1 = colreg.get(IWorkbenchThemeConstants.ACTIVE_TAB_BG_START);
-    Color c2 = colreg.get(IWorkbenchThemeConstants.ACTIVE_TAB_BG_END);
-    UIModeData data = new UIModeData(c1, c2);
+    Color activec1 = colreg.get(IWorkbenchThemeConstants.ACTIVE_TAB_BG_START);
+    Color activec2 = colreg.get(IWorkbenchThemeConstants.ACTIVE_TAB_BG_END);
+    Color inactivec1 = colreg.get(IWorkbenchThemeConstants.INACTIVE_TAB_BG_START);
+    Color inactivec2 = colreg.get(IWorkbenchThemeConstants.INACTIVE_TAB_BG_END);
+    UIModeData data = new UIModeData(activec1, activec2,
+                                     inactivec1, inactivec2);
     return data;
   }
 
diff --git a/intrace.ecl.site/site.xml b/intrace.ecl.site/site.xml
index 8023fff..fe3a16a 100644
--- a/intrace.ecl.site/site.xml
+++ b/intrace.ecl.site/site.xml
@@ -3,7 +3,7 @@
    <description name="InTrace Update Site">
       InTrace Update Site
    </description>
-   <feature url="features/intrace.ecl.feature_0.17.0.jar" id="intrace.ecl.feature" version="0.17">
+   <feature url="features/intrace.ecl.feature_0.18.0.jar" id="intrace.ecl.feature" version="0.18">
       <category name="intrace.ecl.category"/>
    </feature>
    <category-def name="intrace.ecl.category" label="InTrace Eclipse Plugin"/>
diff --git a/org.intrace/lib/intrace-agent.jar b/org.intrace/lib/intrace-agent.jar
index f318170..928d79b 100644
Binary files a/org.intrace/lib/intrace-agent.jar and b/org.intrace/lib/intrace-agent.jar differ
diff --git a/org.intrace/src/org/intrace/client/gui/helper/InTraceUI.java b/org.intrace/src/org/intrace/client/gui/helper/InTraceUI.java
index e64ea2f..3cb5046 100644
--- a/org.intrace/src/org/intrace/client/gui/helper/InTraceUI.java
+++ b/org.intrace/src/org/intrace/client/gui/helper/InTraceUI.java
@@ -124,13 +124,20 @@ public class InTraceUI implements ISocketCallback, IControlConnectionListener
 
   public static class UIModeData
   {
-    public UIModeData(Color colorOne, Color colorTwo)
+    public UIModeData(Color activeColorOne,
+                      Color activeColorTwo,
+                      Color inactiveColorOne,
+                      Color inactiveColorTwo)
     {
-      this.colorOne = colorOne;
-      this.colorTwo = colorTwo;
+      this.activeColorOne = activeColorOne;
+      this.activeColorTwo = activeColorTwo;
+      this.inactiveColorOne = inactiveColorOne;
+      this.inactiveColorTwo = inactiveColorTwo;
     }
-    public final Color colorOne;
-    public final Color colorTwo;
+    public final Color activeColorOne;
+    public final Color activeColorTwo;
+    public final Color inactiveColorOne;
+    public final Color inactiveColorTwo;
   }
 
   public static class ConfigDataInterface
@@ -716,8 +723,8 @@ public class InTraceUI implements ISocketCallback, IControlConnectionListener
         if (modeData != null)
         {
           mSettingsCTabs.setSelectionBackground(
-              new Color[]{modeData.colorOne,
-                          modeData.colorTwo},
+              new Color[]{modeData.inactiveColorOne,
+                          modeData.inactiveColorTwo},
                           new int[]{100}, true);
         }
 
@@ -1065,8 +1072,8 @@ public class InTraceUI implements ISocketCallback, IControlConnectionListener
         if (modeData != null)
         {
           mOutputCTabs.setSelectionBackground(
-                       new Color[]{modeData.colorOne,
-                                   modeData.colorTwo},
+                       new Color[]{modeData.activeColorOne,
+                                   modeData.activeColorTwo},
                                    new int[]{100}, true);
         }
 
diff --git a/org.intrace/src/org/intrace/client/gui/helper/IncludeExcludeWindow.java b/org.intrace/src/org/intrace/client/gui/helper/IncludeExcludeWindow.java
index 965f5d9..18f6991 100644
--- a/org.intrace/src/org/intrace/client/gui/helper/IncludeExcludeWindow.java
+++ b/org.intrace/src/org/intrace/client/gui/helper/IncludeExcludeWindow.java
@@ -115,8 +115,8 @@ public class IncludeExcludeWindow
       if (this.modedata != null)
       {
         ctabs.setSelectionBackground(
-            new Color[]{this.modedata.colorOne,
-                        this.modedata.colorTwo},
+            new Color[]{this.modedata.activeColorOne,
+                        this.modedata.activeColorTwo},
                         new int[]{100}, true);
       }
     }