diff --git a/com.google.eclipse.tm.terminal/plugin.properties b/com.google.eclipse.tm.terminal/plugin.properties
index 78a6ff7..26ccbac 100644
--- a/com.google.eclipse.tm.terminal/plugin.properties
+++ b/com.google.eclipse.tm.terminal/plugin.properties
@@ -20,9 +20,9 @@
 pluginName = Target Management Terminal Widget
 providerName = Eclipse TM Project
 
-terminal.context.name=Terminal widget context
+terminal.context.name=Terminal Widget
 terminal.context.description=Override ALT+x menu access keys
 
 terminal.insertion.description=Terminal view insertion
 terminal.insertion.name=Terminal view insert
-terminal.insertion.category.name=Terminal view commands
+terminal.insertion.category.name=Terminal Widget
diff --git a/com.google.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java b/com.google.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java
index 2d8c41b..c91294e 100644
--- a/com.google.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java
+++ b/com.google.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/StyleMap.java
@@ -15,15 +15,13 @@
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.textcanvas;
 
+import java.util.*;
+
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.tm.terminal.model.Style;
-import org.eclipse.tm.terminal.model.StyleColor;
-
-import java.util.HashMap;
-import java.util.Map;
+import org.eclipse.tm.terminal.model.*;
 
 public class StyleMap {
 	private static final String BLACK = "black"; //$NON-NLS-1$
@@ -86,7 +84,7 @@
 		if(fInvertColors) {
 			setColor(fColorMapBackground, WHITE, background.red, background.green, background.blue); // set background
 			setColor(fColorMapBackground, WHITE_FOREGROUND, 50, 50, 50); // only used when colors are inverse
-			setColor(fColorMapBackground, BLACK, 255, 255, 255); // set cursor color
+			setColor(fColorMapBackground, BLACK, foreground.red, foreground.green, foreground.blue); // set cursor color
 		} else {
 			setColor(fColorMapBackground, WHITE, 255, 255, 255);
 			setColor(fColorMapBackground, WHITE_FOREGROUND, 229, 229, 229);