Merge lp:~danilovesky/workcraft/trunk-menu-tools into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/Circuit.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/Circuit.java	2015-05-27 12:14:35 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/Circuit.java	2015-06-26 22:23:53 +0000
@@ -32,6 +32,7 @@
 import org.workcraft.dom.math.MathNode;
 import org.workcraft.exceptions.InvalidConnectionException;
 import org.workcraft.gui.propertyeditor.ModelProperties;
+import org.workcraft.gui.propertyeditor.NamePropertyDescriptor;
 import org.workcraft.plugins.circuit.Contact.IOType;
 import org.workcraft.plugins.circuit.references.CircuitReferenceManager;
 import org.workcraft.serialisation.References;
@@ -88,7 +89,7 @@
 		ModelProperties properties = super.getProperties(node);
 		if (node != null)  {
 			if (node instanceof Joint) {
-				properties.removeByName("Name");
+				properties.removeByName(NamePropertyDescriptor.PROPERTY_NAME);
 			}
 		}
 		return properties;
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitComponent.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitComponent.java	2015-05-20 16:27:35 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/CircuitComponent.java	2015-06-26 22:23:53 +0000
@@ -44,6 +44,10 @@
 @VisualClass(org.workcraft.plugins.circuit.VisualCircuitComponent.class)
 public class CircuitComponent extends MathGroup implements Container, ObservableHierarchy {
 	
+	public static final String PROPERTY_NAME = "Name";
+	public static final String PROPERTY_IS_ENVIRONMENT = "Treat as environment";
+	public static final String PROPERTY_IS_ZERO_DELAY = "Zero delay";
+
 	private final class CircuitHierarchySupervisor extends HierarchySupervisor {
 		@Override
 		public void handleEvent(HierarchyEvent e) {
@@ -79,7 +83,7 @@
 	
 	public void setIsEnvironment(boolean value) {
 		this.isEnvironment = value;
-		sendNotification(new PropertyChangedEvent(this, "is environment"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_IS_ENVIRONMENT));
 	}
 
 	public boolean getIsEnvironment() {
@@ -88,7 +92,7 @@
 
 	public void setIsZeroDelay(boolean value) {
 		this.isZeroDelay = value;
-		sendNotification(new PropertyChangedEvent(this, "is zero delay"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_IS_ZERO_DELAY));
 	}
 
 	public boolean getIsZeroDelay() {
@@ -194,7 +198,7 @@
 
 	public void setName(String name) {
 		this.name = name;
-		sendNotification(new PropertyChangedEvent(this, "name"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_NAME));
 	}
 
 	public String getName() {
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/Contact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/Contact.java	2015-05-15 14:41:05 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/Contact.java	2015-06-26 22:23:53 +0000
@@ -30,10 +30,10 @@
 @VisualClass(org.workcraft.plugins.circuit.VisualContact.class)
 public class Contact extends MathNode implements BooleanVariable {
 	
-	public static final String PROPERTY_INIT_TO_ONE = "init to one";
-	public static final String PROPERTY_IO_TYPE = "IO type";
-
-	public static final String PROPERTY_NAME = "name";
+	public static final String PROPERTY_INIT_TO_ONE = "Init to one";
+	public static final String PROPERTY_IO_TYPE = "I/O type";
+	public static final String PROPERTY_NAME = "Name";
+	
 	public enum IOType {
 		INPUT("Input"),
 		OUTPUT("Output");
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/Environment.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/Environment.java	2015-02-09 10:46:28 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/Environment.java	2015-06-26 22:23:53 +0000
@@ -6,6 +6,8 @@
 import org.workcraft.observation.PropertyChangedEvent;
 
 public class Environment extends MathNode {
+	public static final String PROPERTY_FILE = "file";
+	public static final String PROPERTY_BASE = "base";
 	private File file;
 	private File base;
 	
@@ -19,7 +21,7 @@
 	
 	public void setFile(File file) {
 		this.file = file;
-		sendNotification(new PropertyChangedEvent(this, "file"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_FILE));
 	}
 
 	public File getBase() {
@@ -28,7 +30,7 @@
 
 	public void setBase(File base) {
 		this.base = base;
-		sendNotification(new PropertyChangedEvent(this, "base"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_BASE));
 	}
 	
 }
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/FunctionContact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/FunctionContact.java	2014-09-05 14:09:00 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/FunctionContact.java	2015-06-26 22:23:53 +0000
@@ -27,6 +27,9 @@
 
 @VisualClass(org.workcraft.plugins.circuit.VisualFunctionContact.class)
 public class FunctionContact extends Contact {
+	public static final String PROPERTY_SET_FUNCTION = "Set function";
+	public static final String PROPERTY_RESET_FUNCTION = "Reset function";
+	
 	private BooleanFormula setFunction = null;
 	private BooleanFormula resetFunction = null;
 	
@@ -44,7 +47,7 @@
 	
 	public void setSetFunction(BooleanFormula setFunction) {
 		this.setFunction = setFunction;
-		sendNotification(new PropertyChangedEvent(this, "setFunction"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_SET_FUNCTION));
 	}
 	
 	public BooleanFormula getResetFunction() {
@@ -53,7 +56,7 @@
 	
 	public void setResetFunction(BooleanFormula resetFunction) {
 		this.resetFunction = resetFunction;
-		sendNotification(new PropertyChangedEvent(this, "resetFunction"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_RESET_FUNCTION));
 	}
 
 }
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java	2015-05-22 17:42:39 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualCircuitComponent.java	2015-06-26 22:23:53 +0000
@@ -74,6 +74,8 @@
 @SVGIcon("images/icons/svg/circuit-component.svg")
 public class VisualCircuitComponent extends VisualComponent implements
 		Container, CustomTouchable, StateObserver, ObservableHierarchy {
+	public static final String PROPERTY_RENDER_TYPE = "Render type";
+	
 	private Color inputColor = VisualContact.inputColor;
 	private Color outputColor = VisualContact.outputColor;
 
@@ -97,7 +99,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualCircuitComponent, Boolean>(
-				this, "Treat as environment", Boolean.class) {
+				this, CircuitComponent.PROPERTY_IS_ENVIRONMENT, Boolean.class) {
 			protected void setter(VisualCircuitComponent object, Boolean value) {
 				object.setIsEnvironment(value);
 			}
@@ -108,7 +110,7 @@
 		});
 //TODO: Complete support for zero-delay buffers and inverters.
 //		addPropertyDeclaration(new PropertyDeclaration<VisualCircuitComponent, Boolean>(
-//				this, "Zero delay", Boolean.class) {
+//				this, CircuitComponent.PROPERTY_IS_ZERO_DELAY, Boolean.class) {
 //			protected void setter(VisualCircuitComponent object, Boolean value) {
 //				object.setIsZeroDelay(value);
 //			}
@@ -119,7 +121,7 @@
 //		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualCircuitComponent, RenderType>(
-				this, "Render type", RenderType.class) {
+				this, PROPERTY_RENDER_TYPE, RenderType.class) {
 			protected void setter(VisualCircuitComponent object, RenderType value) {
 				object.setRenderType(value);
 			}
@@ -197,7 +199,7 @@
 			this.renderType = renderType;
 			setContactsDefaultPosition();
 			invalidateBoundingBox();
-			sendNotification(new PropertyChangedEvent(this, "render type"));
+			sendNotification(new PropertyChangedEvent(this, PROPERTY_RENDER_TYPE));
 		}
 	}
 	
@@ -795,11 +797,11 @@
 		if (e instanceof PropertyChangedEvent) {
 			PropertyChangedEvent pc = (PropertyChangedEvent) e;
 			String propertyName = pc.getPropertyName();
-			if (propertyName.equals("name")
-				|| propertyName.equals("IOtype")
-				|| propertyName.equals("direction")
-				|| propertyName.equals("setFunction")
-				|| propertyName.equals("resetFunction")) {
+			if (propertyName.equals(Contact.PROPERTY_NAME)
+				|| propertyName.equals(Contact.PROPERTY_IO_TYPE)
+				|| propertyName.equals(VisualContact.PROPERTY_DIRECTION)
+				|| propertyName.equals(FunctionContact.PROPERTY_SET_FUNCTION)
+				|| propertyName.equals(FunctionContact.PROPERTY_RESET_FUNCTION)) {
 
 				for (Node node : getChildren()) {
 					if (node instanceof VisualFunctionContact) {
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java	2015-04-23 18:20:32 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContact.java	2015-06-26 22:23:53 +0000
@@ -50,6 +50,8 @@
 
 public class VisualContact extends VisualComponent implements StateObserver {
 
+	public static final String PROPERTY_DIRECTION = "Direction";
+
 	public enum Direction {	
 		WEST("West"),
 		NORTH("North"),
@@ -151,7 +153,7 @@
 	
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualContact, Direction>(
-				this, "Direction", Direction.class) {
+				this, PROPERTY_DIRECTION, Direction.class) {
 			protected void setter(VisualContact object, Direction value) {
 				object.setDirection(value);
 			}
@@ -161,7 +163,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualContact, IOType>(
-				this, "I/O type", IOType.class, true, true, false) {
+				this, Contact.PROPERTY_IO_TYPE, IOType.class, true, true, false) {
 			protected void setter(VisualContact object, IOType value) {
 				object.getReferencedContact().setIOType(value);
 			}
@@ -171,7 +173,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualContact, Boolean>(
-				this, "Init to one", Boolean.class) {
+				this, Contact.PROPERTY_INIT_TO_ONE, Boolean.class) {
 			protected void setter(VisualContact object, Boolean value) {
 				object.getReferencedContact().setInitToOne(value);
 			}
@@ -322,7 +324,7 @@
 		if (value != direction) {
 			sendNotification(new TransformChangingEvent(this));
 			this.direction = value;
-			sendNotification(new PropertyChangedEvent(this, "direction"));
+			sendNotification(new PropertyChangedEvent(this, PROPERTY_DIRECTION));
 			sendNotification(new TransformChangedEvent(this));
 		}
 	}	
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContactFormulaProperties.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContactFormulaProperties.java	2015-04-13 18:41:37 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualContactFormulaProperties.java	2015-06-26 22:23:53 +0000
@@ -50,7 +50,7 @@
 			@Override
 			public void setValue(Object value) throws InvocationTargetException {
 				String setFunction = (String)value;
-				if (!setFunction.equals("")) {
+				if (!setFunction.isEmpty()) {
 					contact.setSetFunction(parseFormula(contact, setFunction));
 				} else {
 					contact.setSetFunction(null);
@@ -100,7 +100,7 @@
 			@Override
 			public void setValue(Object value) throws InvocationTargetException {
 				String setFunction = (String)value;
-				if (!setFunction.equals("")) {
+				if (!setFunction.isEmpty()) {
 					contact.setResetFunction(parseFormula(contact, setFunction));
 				} else {
 					contact.setResetFunction(null);
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionComponent.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionComponent.java	2015-05-23 21:39:28 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionComponent.java	2015-06-26 22:23:53 +0000
@@ -165,7 +165,7 @@
 		super.notify(e);
 		if (e instanceof PropertyChangedEvent) {
 			PropertyChangedEvent pc = (PropertyChangedEvent)e;
-			if (pc.getPropertyName().equals("direction")) {
+			if (pc.getPropertyName().equals(VisualContact.PROPERTY_DIRECTION)) {
 				if ((getMainContact() == pc.getSender()) && (getRenderingResult() != null)) {
 					setContactsDefaultPosition();
 				}
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionContact.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionContact.java	2015-02-18 16:25:29 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/VisualFunctionContact.java	2015-06-26 22:23:53 +0000
@@ -326,10 +326,11 @@
 	public void notify(StateEvent e) {
 		if (e instanceof PropertyChangedEvent) {
 			PropertyChangedEvent pc = (PropertyChangedEvent)e;
-			if (pc.getPropertyName().equals("setFunction") || pc.getPropertyName().equals("resetFunction")) {
+			String propertyName = pc.getPropertyName();
+			if (propertyName.equals(FunctionContact.PROPERTY_SET_FUNCTION) || propertyName.equals(FunctionContact.PROPERTY_RESET_FUNCTION)) {
 				invalidateRenderedFormula();
 			}
-			if (pc.getPropertyName().equals("name")) {
+			if (propertyName.equals(Contact.PROPERTY_NAME)) {
 				for (VisualFunctionContact vc : getAllContacts()) {
 					vc.invalidateRenderedFormula();
 				}
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/references/CircuitReferenceManager.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/references/CircuitReferenceManager.java	2014-09-27 20:09:17 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/references/CircuitReferenceManager.java	2015-06-26 22:23:53 +0000
@@ -35,17 +35,16 @@
 	public void setName(Node node, String name) {
 		// support for the older models
 		if (Identifier.isNumber(name) && node instanceof Contact) {
-			String n = ((Contact)node).getName();
-			if ((n != null) && !n.equals("")) {
-				name = n;
+			String nodeName = ((Contact)node).getName();
+			if ((nodeName != null) && !nodeName.isEmpty()) {
+				name = nodeName;
 			}
 		} else if (Identifier.isNumber(name) && node instanceof CircuitComponent) {
-			String n = ((CircuitComponent)node).getName();
-			if ((n != null) && !n.equals("")) {
-				name = n;
+			String nodeName = ((CircuitComponent)node).getName();
+			if ((nodeName != null) && !nodeName.isEmpty()) {
+				name = nodeName;
 			}
 		} else if (Identifier.isNumber(name)) {
-			// name="_"+name;
 			name = getPrefix(node) + name;
 		}
 		if (node instanceof Contact) {
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/serialisation/CircuitConnectionDeserializer.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/serialisation/CircuitConnectionDeserializer.java	2010-10-26 23:44:40 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/serialisation/CircuitConnectionDeserializer.java	2015-06-26 22:23:53 +0000
@@ -23,16 +23,6 @@
 			ReferenceResolver internalReferenceResolver,
 			ReferenceResolver externalReferenceResolver,
 			NodeFinaliser nodeFinaliser) throws DeserialisationException {
-		
-	/*	VisualCircuitConnection vc = (VisualCircuitConnection) instance;
-		
-		vc.setVisualConnectionDependencies(
-				(VisualComponent)externalReferenceResolver.getObject(element.getAttribute("first")), 
-				(VisualComponent)externalReferenceResolver.getObject(element.getAttribute("second")), 
-				new Polyline(vc),
-				(CircuitConnection)externalReferenceResolver.getObject(element.getAttribute("ref"))
-				);*/
-		
 	}
 
 	@Override
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/serialisation/CircuitConnectionSerializer.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/serialisation/CircuitConnectionSerializer.java	2010-10-26 23:44:40 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/serialisation/CircuitConnectionSerializer.java	2015-06-26 22:23:53 +0000
@@ -14,11 +14,6 @@
 			ReferenceProducer internalReferences,
 			ReferenceProducer externalReferences, NodeSerialiser nodeSerialiser)
 			throws SerialisationException {
-		
-/*		VisualCircuitConnection vc = (VisualCircuitConnection) object;
-		element.setAttribute("first", internalReferences.getReference(vc.getFirst()));
-		element.setAttribute("second", internalReferences.getReference(vc.getSecond()));
-		*/
 	}
 
 	@Override
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/serialisation/FunctionSerialiser.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/serialisation/FunctionSerialiser.java	2010-10-26 23:44:40 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/serialisation/FunctionSerialiser.java	2015-06-26 22:23:53 +0000
@@ -35,8 +35,7 @@
 	public static final String SET_FUNCTION_ATTRIBUTE_NAME = "setFunction";
 
 	@Override
-	public String getClassName()
-	{
+	public String getClassName() {
 		return org.workcraft.plugins.circuit.FunctionContact.class.getName();
 	}
 
@@ -47,7 +46,11 @@
 			throws SerialisationException {
 		FunctionContact function = (FunctionContact) object;
 		
-		BooleanFormulaSerialiser.writeFormulaAttribute(element, internalReferences, function.getSetFunction(), SET_FUNCTION_ATTRIBUTE_NAME);
-		BooleanFormulaSerialiser.writeFormulaAttribute(element, internalReferences, function.getResetFunction(), RESET_FUNCTION_ATTRIBUTE_NAME);
+		BooleanFormulaSerialiser.writeFormulaAttribute(element, internalReferences, 
+				function.getSetFunction(), SET_FUNCTION_ATTRIBUTE_NAME);
+
+		BooleanFormulaSerialiser.writeFormulaAttribute(element, internalReferences, 
+				function.getResetFunction(), RESET_FUNCTION_ATTRIBUTE_NAME);
 	}
-}
 \ No newline at end of file
+	
+}
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitStgUtils.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitStgUtils.java	2015-04-28 17:37:41 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/stg/CircuitStgUtils.java	2015-06-26 22:23:53 +0000
@@ -17,11 +17,16 @@
 import org.workcraft.tasks.Result;
 import org.workcraft.tasks.Result.Outcome;
 import org.workcraft.util.Export;
+import org.workcraft.util.Export.ExportTask;
 import org.workcraft.util.FileUtils;
-import org.workcraft.util.Export.ExportTask;
 import org.workcraft.workspace.WorkspaceEntry;
 
 public class CircuitStgUtils {
+	public static final String TEMP_DIRECTORY_PREFIX = "workcraft-"; 
+	public static final String DEVICE_FILE_NAME = "device"; 
+	public static final String ENVIRONMENT_FILE_NAME = "environment"; 
+	public static final String SYSTEM_FILE_NAME = "system"; 
+	public static final String ASTG_FILE_EXT = ".g"; 
 	
 	public static CircuitToStgConverter createCircuitToStgConverter(VisualCircuit circuit) {
 		CircuitToStgConverter generator = new CircuitToStgConverter(circuit);
@@ -39,7 +44,7 @@
 	public static VisualSTG composeDevStgWithEvnFile(VisualSTG devStg, File envFile) {
 		VisualSTG resultStg = null;
 		Framework framework = Framework.getInstance();
-		File workingDirectory = FileUtils.createTempDirectory("workcraft-");
+		File workingDirectory = FileUtils.createTempDirectory(TEMP_DIRECTORY_PREFIX);
 		try {
 			File devStgFile = exportDevStg(devStg, workingDirectory);
 			File envStgFile = exportEnvStg(envFile, workingDirectory);
@@ -62,7 +67,7 @@
 		Framework framework = Framework.getInstance();
 		if ((devStgFile != null) && (envStgFile != null)) {
 			// Generating .g for the whole system (circuit and environment)
-			stgFile = new File(workingDirectory, "system.g");
+			stgFile = new File(workingDirectory, SYSTEM_FILE_NAME + ASTG_FILE_EXT);
 			PcompTask pcompTask = new PcompTask(new File[]{devStgFile, envStgFile}, 
 					ConversionMode.OUTPUT, true, false, workingDirectory);
 			
@@ -81,12 +86,12 @@
 	private static File exportEnvStg(File envFile, File workingDirectory) throws DeserialisationException, IOException {
 		Framework framework = Framework.getInstance();
 		File envStgFile = null;
-		if (envFile.getName().endsWith(".g")) {
+		if (envFile.getName().endsWith(ASTG_FILE_EXT)) {
 			envStgFile = envFile;
 		} else {
 			STG envStg = (STG)framework.loadFile(envFile).getMathModel();
 			Exporter envStgExporter = Export.chooseBestExporter(framework.getPluginManager(), envStg, Format.STG);
-			envStgFile = new File(workingDirectory, "env.g");
+			envStgFile = new File(workingDirectory, ENVIRONMENT_FILE_NAME + ASTG_FILE_EXT);
 			ExportTask envExportTask = new ExportTask(envStgExporter, envStg, envStgFile.getCanonicalPath());
 			Result<? extends Object> envExportResult = framework.getTaskManager().execute(
 					envExportTask, "Exporting environment .g", null);
@@ -103,14 +108,13 @@
 		STG devStg = (STG)visualStg.getMathModel();
 		Exporter devStgExporter = Export.chooseBestExporter(framework.getPluginManager(), devStg, Format.STG);
 		if (devStgExporter == null) {
-			throw new RuntimeException ("Exporter not available: model class " + devStg.getClass().getName() + " to format STG.");
+			throw new RuntimeException("Exporter not available: model class " + devStg.getClass().getName() + " to .g format.");
 		}
 
-		String devStgName = "dev.g";
-		File devStgFile =  new File(workingDirectory, devStgName);
+		File devStgFile =  new File(workingDirectory, DEVICE_FILE_NAME + ASTG_FILE_EXT);
 		ExportTask devExportTask = new ExportTask(devStgExporter, devStg, devStgFile.getCanonicalPath());
 		Result<? extends Object> devExportResult = framework.getTaskManager().execute(
-				devExportTask, "Exporting circuit .g", null);
+				devExportTask, "Exporting device .g", null);
 		if (devExportResult.getOutcome() != Outcome.FINISHED) {
 			devStgFile = null;
 		}
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/tasks/CheckCircuitTask.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/tasks/CheckCircuitTask.java	2015-04-30 23:14:48 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tasks/CheckCircuitTask.java	2015-06-26 22:23:53 +0000
@@ -12,6 +12,7 @@
 import org.workcraft.Framework;
 import org.workcraft.interop.Exporter;
 import org.workcraft.plugins.circuit.VisualCircuit;
+import org.workcraft.plugins.circuit.stg.CircuitStgUtils;
 import org.workcraft.plugins.circuit.stg.CircuitToStgConverter;
 import org.workcraft.plugins.mpsat.MpsatMode;
 import org.workcraft.plugins.mpsat.MpsatResultParser;
@@ -77,20 +78,20 @@
 			File envFile = visualCircuit.getEnvironmentFile(); 
 			boolean hasEnvironment = ((envFile != null) && envFile.exists()); 
 
-			String prefix = "workcraft-" + title + "-"; // Prefix must be at least 3 symbols long.
+			String prefix = CircuitStgUtils.TEMP_DIRECTORY_PREFIX + title + "-"; // Prefix must be at least 3 symbols long.
 			workingDirectory = FileUtils.createTempDirectory(prefix);
 
 			CircuitToStgConverter generator = new CircuitToStgConverter(visualCircuit);
 			STG devStg = (STG)generator.getStg().getMathModel();
 			Exporter devStgExporter = Export.chooseBestExporter(framework.getPluginManager(), devStg, Format.STG);
 			if (devStgExporter == null) {
-				throw new RuntimeException ("Exporter not available: model class " + devStg.getClass().getName() + " to format STG.");
+				throw new RuntimeException("Exporter not available: model class " + devStg.getClass().getName() + " to .g format.");
 			}
 			SubtaskMonitor<Object> subtaskMonitor = new SubtaskMonitor<Object>(monitor);
 			monitor.progressUpdate(0.10);
 
 			// Generating .g for the circuit
-			String devStgName = (hasEnvironment ? "dev.g" : "system.g");
+			String devStgName = (hasEnvironment ? CircuitStgUtils.DEVICE_FILE_NAME : CircuitStgUtils.SYSTEM_FILE_NAME) + CircuitStgUtils.ASTG_FILE_EXT;
 			File devStgFile =  new File(workingDirectory, devStgName);
 			ExportTask devExportTask = new ExportTask(devStgExporter, devStg, devStgFile.getCanonicalPath());
 			Result<? extends Object> devExportResult = framework.getTaskManager().execute(
@@ -114,12 +115,12 @@
 				 stg = devStg;
 			} else {
 				File envStgFile = null;
-				if (envFile.getName().endsWith(".g")) {
+				if (envFile.getName().endsWith(CircuitStgUtils.ASTG_FILE_EXT)) {
 					envStgFile = envFile;
 				} else {
 					STG envStg = (STG)framework.loadFile(envFile).getMathModel();
 					Exporter envStgExporter = Export.chooseBestExporter(framework.getPluginManager(), envStg, Format.STG);
-					envStgFile = new File(workingDirectory, "env.g");
+					envStgFile = new File(workingDirectory, CircuitStgUtils.ENVIRONMENT_FILE_NAME + CircuitStgUtils.ASTG_FILE_EXT);
 					ExportTask envExportTask = new ExportTask(envStgExporter, envStg, envStgFile.getCanonicalPath());
 					Result<? extends Object> envExportResult = framework.getTaskManager().execute(
 							envExportTask, "Exporting environment .g", subtaskMonitor);
@@ -135,7 +136,7 @@
 				monitor.progressUpdate(0.25);
 
 				// Generating .g for the whole system (circuit and environment)
-				stgFile = new File(workingDirectory, "system.g");
+				stgFile = new File(workingDirectory, CircuitStgUtils.SYSTEM_FILE_NAME + CircuitStgUtils.ASTG_FILE_EXT);
 				PcompTask pcompTask = new PcompTask(new File[]{devStgFile, envStgFile}, ConversionMode.OUTPUT, true, false, workingDirectory);
 				pcompResult = framework.getTaskManager().execute(
 						pcompTask, "Running pcomp", subtaskMonitor);
@@ -155,7 +156,7 @@
 			monitor.progressUpdate(0.30);
 
 			// Generate unfolding
-			File unfoldingFile = new File(workingDirectory, "system" + MpsatUtilitySettings.getUnfoldingExtension(true));
+			File unfoldingFile = new File(workingDirectory, CircuitStgUtils.SYSTEM_FILE_NAME + MpsatUtilitySettings.getUnfoldingExtension(true));
 			PunfTask punfTask = new PunfTask(stgFile.getCanonicalPath(), unfoldingFile.getCanonicalPath(), true);
 			Result<? extends ExternalProcessResult> punfResult = framework.getTaskManager().execute(
 					punfTask, "Unfolding .g", subtaskMonitor);
 
=== modified file 'CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CheckCircuitTool.java'
--- CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CheckCircuitTool.java	2015-04-23 12:19:54 +0000
+++ CircuitPlugin/src/org/workcraft/plugins/circuit/tools/CheckCircuitTool.java	2015-06-26 22:23:53 +0000
@@ -15,7 +15,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/Arc.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/Arc.java	2010-04-13 15:52:01 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/Arc.java	2015-06-26 22:23:53 +0000
@@ -26,28 +26,25 @@
 import org.workcraft.plugins.cpog.optimisation.BooleanFormula;
 import org.workcraft.plugins.cpog.optimisation.expressions.One;
 
-public class Arc extends MathConnection
-{
+public class Arc extends MathConnection {
+	public static final String PROPERTY_CONDITION = "Condition";
+	
 	private BooleanFormula condition;
 
-	public Arc()
-	{	
+	public Arc() {	
 	}
 	
-	public Arc(Vertex first, Vertex second)
-	{
+	public Arc(Vertex first, Vertex second) {
 		super(first, second);
 		condition = One.instance();
 	}
 
-	public void setCondition(BooleanFormula condition)
-	{
+	public void setCondition(BooleanFormula condition) {
 		this.condition = condition;
-		sendNotification(new PropertyChangedEvent(this, "condition"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_CONDITION));
 	}	
 	
-	public BooleanFormula getCondition()
-	{
+	public BooleanFormula getCondition() {
 		return condition;
 	}
 }
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/RhoClause.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/RhoClause.java	2014-09-19 16:15:28 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/RhoClause.java	2015-06-26 22:23:53 +0000
@@ -28,13 +28,14 @@
 import org.workcraft.plugins.cpog.optimisation.expressions.BooleanOperations;
 
 @VisualClass(org.workcraft.plugins.cpog.VisualRhoClause.class)
-public class RhoClause extends MathNode
-{
+public class RhoClause extends MathNode {
+	public static final String PROPERTY_FORMULA = "Formula";
+	
 	private BooleanFormula formula = BooleanOperations.ONE;
 	
 	public void setFormula(BooleanFormula formula) {
 		this.formula = formula;
-		sendNotification(new PropertyChangedEvent(this, "formula"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_FORMULA));
 	}	
 	
 	public BooleanFormula getFormula() {
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/Variable.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/Variable.java	2014-09-19 16:15:28 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/Variable.java	2015-06-26 22:23:53 +0000
@@ -28,16 +28,17 @@
 import org.workcraft.plugins.cpog.optimisation.expressions.BooleanVisitor;
 
 @VisualClass(org.workcraft.plugins.cpog.VisualVariable.class)
-public class Variable extends MathNode implements Comparable<Variable>, BooleanVariable
-{
+public class Variable extends MathNode implements Comparable<Variable>, BooleanVariable {
 	
+	public static final String PROPERTY_STATE = "State";
+
 	private VariableState state = VariableState.UNDEFINED;
 	
 	private String label = "";
 
 	public void setState(VariableState state) {
 		this.state = state;
-		sendNotification(new PropertyChangedEvent(this, "state"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_STATE));
 	}
 
 	public VariableState getState() {
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/Vertex.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/Vertex.java	2014-09-19 16:15:28 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/Vertex.java	2015-06-26 22:23:53 +0000
@@ -28,13 +28,14 @@
 import org.workcraft.plugins.cpog.optimisation.expressions.One;
 
 @VisualClass(org.workcraft.plugins.cpog.VisualVertex.class)
-public class Vertex extends MathNode
-{
+public class Vertex extends MathNode {
+	public static final String PROPERTY_CONDITION = "Condition";
+	
 	private BooleanFormula condition = One.instance();
 	
 	public void setCondition(BooleanFormula condition) {
 		this.condition = condition;
-		sendNotification(new PropertyChangedEvent(this, "condition"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_CONDITION));
 	}	
 	
 	public BooleanFormula getCondition() {
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualArc.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualArc.java	2014-10-28 16:22:12 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualArc.java	2015-06-26 22:23:53 +0000
@@ -49,8 +49,8 @@
 import org.workcraft.plugins.cpog.optimisation.expressions.Zero;
 import org.workcraft.util.Geometry;
 
-public class VisualArc extends VisualConnection
-{
+public class VisualArc extends VisualConnection {
+	public static final String PROPERTY_CONDITION = "condition";
 	private static Font labelFont;
 	private Rectangle2D labelBB = null; 
 	
@@ -68,14 +68,12 @@
 		}
 	}
 	
-	public VisualArc(Arc mathConnection)
-	{
+	public VisualArc(Arc mathConnection) {
 		super();
 		this.mathConnection = mathConnection;
 	}
 	
-	public VisualArc(Arc mathConnection, VisualVertex first, VisualVertex second)
-	{
+	public VisualArc(Arc mathConnection, VisualVertex first, VisualVertex second) {
 		super(mathConnection, first, second);
 		this.mathConnection = mathConnection;
 	}
@@ -86,8 +84,7 @@
 	}
 	
 	@Override
-	public Stroke getStroke()
-	{
+	public Stroke getStroke() {
 		BooleanFormula value = evaluate();
 		
 		if (value == Zero.instance()) 
@@ -98,8 +95,7 @@
 	}
 	
 	@Override
-	public Color getDrawColor()
-	{
+	public Color getDrawColor() {
 		BooleanFormula value = evaluate();
 		
 		if (value == Zero.instance() || value == One.instance()) return super.getDrawColor();
@@ -107,20 +103,17 @@
 		return Color.LIGHT_GRAY;
 	}
 
-	private BooleanFormula evaluate()
-	{
+	private BooleanFormula evaluate() {
 		BooleanFormula condition = getCondition();
 		
 		condition = BooleanOperations.and(condition, ((VisualVertex) getFirst()).evaluate());
 		condition = BooleanOperations.and(condition, ((VisualVertex) getSecond()).evaluate());
 		
 		return condition.accept(
-				new BooleanReplacer(new HashMap<BooleanVariable, BooleanFormula>())
-				{
+				new BooleanReplacer(new HashMap<BooleanVariable, BooleanFormula>()) {
 					@Override
 					public BooleanFormula visit(BooleanVariable node) {
-						switch(((Variable)node).getState())
-						{
+						switch(((Variable)node).getState()) {
 						case TRUE:
 							return One.instance();
 						case FALSE:
@@ -133,15 +126,13 @@
 			);
 	}
 
-	public void setCondition(BooleanFormula condition)
-	{
+	public void setCondition(BooleanFormula condition) {
 		mathConnection.setCondition(condition);
-		sendNotification(new PropertyChangedEvent(this, "condition"));		
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_CONDITION));		
 	}
 	
 	@Override
-	public void draw(DrawRequest r)
-	{
+	public void draw(DrawRequest r) {
 		labelBB = null;
 		
 		if (getCondition() == One.instance()) return;
@@ -158,8 +149,7 @@
 		Point2D d = graphic.getDerivativeAt(0.5);
 		Point2D dd = graphic.getSecondDerivativeAt(0.5);
 		
-		if (d.getX() < 0)
-		{
+		if (d.getX() < 0) {
 			d = Geometry.multiply(d, -1);
 			//dd = Geometry.multiply(dd, -1);
 		}
@@ -180,21 +170,19 @@
 	}
 	
 	@Override
-	public Rectangle2D getBoundingBox()
-	{
+	public Rectangle2D getBoundingBox() {
 		return BoundingBoxHelper.union(super.getBoundingBox(), labelBB);
 	}
 	
-	public Rectangle2D getLabelBoundingBox()
-	{
+	public Rectangle2D getLabelBoundingBox() {
 		return labelBB;
 	}
 	
 	@Override
-	public boolean hitTest(Point2D pointInParentSpace)
-	{
+	public boolean hitTest(Point2D pointInParentSpace) {
 		if (labelBB != null && labelBB.contains(pointInParentSpace)) return true;
 		
 		return super.hitTest(pointInParentSpace);
 	}
+	
 }
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualScenario.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualScenario.java	2015-02-26 11:59:35 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualScenario.java	2015-06-26 22:23:53 +0000
@@ -27,6 +27,9 @@
 
 public class VisualScenario extends VisualGroup
 {
+	public static final String PROPERTY_ENCODING = "Encoding";
+	public static final String PROPERTY_LABEL = "Label";
+
 	private static final class ReverseComparator implements Comparator<Variable>
 	{
 		@Override
@@ -65,7 +68,7 @@
 	
 	public VisualScenario() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualScenario, String>(
-				this, "Label", String.class) { 
+				this, PROPERTY_LABEL, String.class) { 
 			public void setter(VisualScenario object, String value) {
 				object.setLabel(value);
 			}
@@ -75,7 +78,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualScenario, Encoding>(
-				this, "Encoding", Encoding.class) { 
+				this, PROPERTY_ENCODING, Encoding.class) { 
 			public void setter(VisualScenario object, Encoding value) {
 				object.setEncoding(value);
 			}
@@ -276,7 +279,7 @@
 
 	public void setLabel(String label) {
 		this.label = label;
-		sendNotification(new PropertyChangedEvent(this, "label"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_LABEL));
 	}
 
 	public String getLabel() {
@@ -285,7 +288,7 @@
 
 	public void setEncoding(Encoding encoding) {
 		this.encoding = encoding;
-		sendNotification(new PropertyChangedEvent(this, "encoding"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_ENCODING));
 	}
 
 	public Encoding getEncoding() {
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualScenarioPage.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualScenarioPage.java	2015-04-02 17:28:13 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualScenarioPage.java	2015-06-26 22:23:53 +0000
@@ -7,12 +7,14 @@
 
 public class VisualScenarioPage extends VisualPage {
 
+	public static final String PROPERTY_ENCODING = "Encoding";
+
 	public VisualScenarioPage(MathNode refNode) {
 		super(refNode);
 		// TODO Auto-generated constructor stub
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualScenarioPage, Encoding>(
-				this, "Encoding", Encoding.class) { 
+				this, PROPERTY_ENCODING, Encoding.class) { 
 			public void setter(VisualScenarioPage object, Encoding value) {
 				object.setEncoding(value);
 			}
@@ -26,7 +28,7 @@
 	
 	public void setEncoding(Encoding encoding) {
 		this.encoding = encoding;
-		sendNotification(new PropertyChangedEvent(this, "encoding"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_ENCODING));
 	}
 
 	public Encoding getEncoding() {
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVariable.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVariable.java	2015-02-26 11:59:35 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVariable.java	2015-06-26 22:23:53 +0000
@@ -50,6 +50,7 @@
 @DisplayName("Variable")
 @SVGIcon("images/icons/svg/variable.svg")
 public class VisualVariable extends VisualComponent {
+	public static final String PROPERTY_LABEL = "Label";
 	private static Font variableFont;
 	private static Font valueFont;
 	
@@ -82,7 +83,7 @@
 	public VisualVariable(Variable variable) {
 		super(variable);
 		addPropertyDeclaration(new PropertyDeclaration<VisualVariable, VariableState>(
-				this, "State", VariableState.class) { 
+				this, Variable.PROPERTY_STATE, VariableState.class) { 
 			public void setter(VisualVariable object, VariableState value) {
 				object.setState(value);
 			}
@@ -155,7 +156,7 @@
 	@Override
 	public void setLabel(String label)	{
 		getMathVariable().setLabel(label);
-		sendNotification(new PropertyChangedEvent(this, "label"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_LABEL));
 	}
 	
 	@Override
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVertex.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVertex.java	2014-10-27 16:09:36 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/VisualVertex.java	2015-06-26 22:23:53 +0000
@@ -55,6 +55,7 @@
 @DisplayName("Vertex")
 @SVGIcon("images/icons/svg/vertex.svg")
 public class VisualVertex extends VisualComponent implements CpogFormulaVariable {
+	public static final String PROPERTY_CONDITION = "Condition";
 	public static Font conditionFont;
 	private RenderedFormula conditionRenderedFormula = new RenderedFormula("", One.instance(), conditionFont, getLabelPositioning(), getLabelOffset());
 	
@@ -132,7 +133,7 @@
 
 	public void setCondition(BooleanFormula condition) {
 		getMathVertex().setCondition(condition);
-		sendNotification(new PropertyChangedEvent(this, "condition"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_CONDITION));
 	}
 	
 	public BooleanFormula evaluate() {
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/gui/ScencoConfigurationDialog.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/gui/ScencoConfigurationDialog.java	2015-05-15 18:05:13 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/gui/ScencoConfigurationDialog.java	2015-06-26 22:23:53 +0000
@@ -507,15 +507,16 @@
 		Object[][] data = new Object[m][3];
 		for(int i=0; i<m; i++){
 			String name;
-			if(scenarios.get(i).getLabel().equals("")){
+			if(scenarios.get(i).getLabel().isEmpty()) {
 				name = "CPOG " + i;
-			}
-			else{
+			} else{
 				name = scenarios.get(i).getLabel();
 			}
 			data[i][0] = name;
 			data[i][1] = "";
-			for(int j=0; j < Integer.valueOf(bitsText.getText()); j++) data[i][1] = data[i][1] + "X";
+			for (int j = 0; j < Integer.valueOf(bitsText.getText()); j++) {
+				data[i][1] = data[i][1] + "X";
+			}
 		}
 		encodingTable = new JTable(data, columnNames);
 		MyTableCellRenderer renderer = new MyTableCellRenderer();
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/serialisation/BooleanFunctionDeserialiser.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/serialisation/BooleanFunctionDeserialiser.java	2014-07-11 09:35:42 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/serialisation/BooleanFunctionDeserialiser.java	2015-06-26 22:23:53 +0000
@@ -87,8 +87,9 @@
 		
 		BooleanFormula formula=null;
 		try {
-			if (!string.equals(""))
+			if (!string.isEmpty()) {
 				formula = BooleanParser.parse(string, new VariableResolver(internalReferenceResolver));
+			}
 		} catch (ParseException e) {
 			throw new DeserialisationException(e);
 		}
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/tasks/ScencoTask.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/tasks/ScencoTask.java	2015-05-15 18:05:13 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/tasks/ScencoTask.java	2015-06-26 22:23:53 +0000
@@ -445,7 +445,7 @@
 				System.out.println("Op-code selected for graphs:");
 				for(int i=0; i<m; i++){
 					String name;
-					if (scenarios.get(i).getLabel().equals("")) {
+					if (scenarios.get(i).getLabel().isEmpty()) {
 						name = "CPOG " + i;
 					} else {
 						name = scenarios.get(i).getLabel();
@@ -832,11 +832,10 @@
 								
 							}
 							String empty = "";
-							for(int i=0; i<settings.getBits(); i++) empty += 'X';
-							if(enc[k].equals("") || enc[k].equals(empty)){
+							for (int i=0; i<settings.getBits(); i++) empty += 'X';
+							if (enc[k].isEmpty() || enc[k].equals(empty)){
 								Output1.println("/");
-							}
-							else{
+							} else {
 								Output1.println(enc[k]);
 							}
 						}
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/BinaryRegister.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/BinaryRegister.java	2015-01-09 12:41:39 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/BinaryRegister.java	2015-06-26 22:23:53 +0000
@@ -4,6 +4,8 @@
 
 public class BinaryRegister extends MathDelayNode {
 
+	public static final String PROPERTY_MARKING = "Marking";
+
 	public enum Marking {
 		EMPTY("empty"),
 		FALSE_TOKEN("false"),
@@ -29,7 +31,7 @@
 
 	public void setMarking(Marking value) {
 		this.marking = value;
-		sendNotification(new PropertyChangedEvent(this, "marking"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_MARKING));
 	}
 
 	public boolean isFalseMarked() {
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/ControlConnection.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/ControlConnection.java	2013-09-10 09:54:55 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/ControlConnection.java	2015-06-26 22:23:53 +0000
@@ -7,6 +7,7 @@
 
 @VisualClass(org.workcraft.plugins.dfs.VisualControlConnection.class)
 public class ControlConnection extends MathConnection {
+	public static final String PROPERTY_INVERTING = "Inverting";
 	private boolean inverting = false;
 	
 	public ControlConnection() {
@@ -22,7 +23,7 @@
 
 	public void setInverting(boolean value) {
 		this.inverting = value;
-		sendNotification(new PropertyChangedEvent(this, "inverting"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_INVERTING));
 	}
 	
 }
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/ControlRegister.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/ControlRegister.java	2015-01-09 12:41:39 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/ControlRegister.java	2015-06-26 22:23:53 +0000
@@ -5,7 +5,9 @@
 
 @VisualClass(org.workcraft.plugins.dfs.VisualControlRegister.class)
 public class ControlRegister extends BinaryRegister {
-
+	public static final String PROPERTY_PROBABILITY = "Probability";
+	public static final String PROPERTY_SYNCHRONISATION_TYPE = "Synchronisation type";
+	
 	private SynchronisationType synchronisationType = SynchronisationType.PLAIN;
 	private double probability = 1.0;
 
@@ -32,7 +34,7 @@
 
 	public void setSynchronisationType(SynchronisationType value) {
 		this.synchronisationType = value;
-		sendNotification(new PropertyChangedEvent(this, "synchronisation type"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_SYNCHRONISATION_TYPE));
 	}
 	
 	public double getProbability() {
@@ -41,7 +43,7 @@
 
 	public void setProbability(double value) {
 		this.probability = value;
-		sendNotification(new PropertyChangedEvent(this, "probability"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_PROBABILITY));
 	}
 
 }
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/CounterflowLogic.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/CounterflowLogic.java	2013-11-13 10:32:32 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/CounterflowLogic.java	2015-06-26 22:23:53 +0000
@@ -5,6 +5,10 @@
 
 @VisualClass(org.workcraft.plugins.dfs.VisualCounterflowLogic.class)
 public class CounterflowLogic extends MathDelayNode {
+	public static final String PROPERTY_FORWARD_COMPUTED = "Forward computed";
+	public static final String PROPERTY_BACKWARD_COMPUTED = "Backward computed";
+	public static final String PROPERTY_FORWARD_EARLY_EVALUATION = "Forward early evaluation";
+	public static final String PROPERTY_BACKWARD_EARLY_EVALUATION = "Backward early evaluation";
 	private boolean forwardComputed = false;
 	private boolean backwardComputed = false;
 	private boolean forwardEarlyEvaluation = false;
@@ -16,7 +20,7 @@
 	
 	public void setForwardComputed(boolean value) {
 		this.forwardComputed = value;
-		sendNotification(new PropertyChangedEvent(this, "forward computed"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_FORWARD_COMPUTED));
 	}
 
 	public boolean isBackwardComputed() {
@@ -25,7 +29,7 @@
 
 	public void setBackwardComputed(boolean value) {
 		this.backwardComputed = value;
-		sendNotification(new PropertyChangedEvent(this, "backward computed"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_BACKWARD_COMPUTED));
 	}
 
 	public boolean isForwardEarlyEvaluation() {
@@ -34,7 +38,7 @@
 
 	public void setForwardEarlyEvaluation(boolean value) {
 		this.forwardEarlyEvaluation = value;
-		sendNotification(new PropertyChangedEvent(this, "forward early evaluation"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_FORWARD_EARLY_EVALUATION));
 	}
 
 	public boolean isBackwardEarlyEvaluation() {
@@ -43,6 +47,6 @@
 
 	public void setBackwardEarlyEvaluation(boolean value) {
 		this.backwardEarlyEvaluation = value;
-		sendNotification(new PropertyChangedEvent(this, "backward early evaluation"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_BACKWARD_EARLY_EVALUATION));
 	}
 }
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/CounterflowRegister.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/CounterflowRegister.java	2013-11-13 10:32:32 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/CounterflowRegister.java	2015-06-26 22:23:53 +0000
@@ -5,6 +5,8 @@
 
 @VisualClass(org.workcraft.plugins.dfs.VisualCounterflowRegister.class)
 public class CounterflowRegister extends MathDelayNode {
+	public static final String PROPERTY_AND_MARKED = "And-marked";
+	public static final String PROPERTY_OR_MARKED = "Or-marked";
 	private boolean orMarked = false;
 	private boolean andMarked = false;
 	
@@ -14,7 +16,7 @@
 
 	public void setOrMarked(boolean orMarked) {
 		this.orMarked = orMarked;
-		sendNotification(new PropertyChangedEvent(this, "or-marked"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_OR_MARKED));
 	}
 	
 	public boolean isAndMarked() {
@@ -23,7 +25,7 @@
 	
 	public void setAndMarked(boolean andMarked) {
 		this.andMarked = andMarked;
-		sendNotification(new PropertyChangedEvent(this, "and-marked"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_AND_MARKED));
 	}
 
 }
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/Logic.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/Logic.java	2013-11-13 10:32:32 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/Logic.java	2015-06-26 22:23:53 +0000
@@ -26,6 +26,9 @@
 
 @VisualClass(org.workcraft.plugins.dfs.VisualLogic.class)
 public class Logic extends MathDelayNode {
+	public static final String PROPERTY_EARLY_EVALUATION = "Early evaluation";
+	public static final String PROPERTY_COMPUTED = "Computed";
+	
 	private boolean computed = false;
 	private boolean earlyEvaluation = false;
 
@@ -35,7 +38,7 @@
 
 	public void setComputed(boolean value) {
 		this.computed = value;
-		sendNotification(new PropertyChangedEvent(this, "computed"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_COMPUTED));
 	}
 
 	public boolean isEarlyEvaluation() {
@@ -44,7 +47,7 @@
 
 	public void setEarlyEvaluation(boolean value) {
 		this.earlyEvaluation = value;
-		sendNotification(new PropertyChangedEvent(this, "early evaluation"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_EARLY_EVALUATION));
 	}
 	
 }
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/MathDelayNode.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/MathDelayNode.java	2013-12-16 12:01:22 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/MathDelayNode.java	2015-06-26 22:23:53 +0000
@@ -22,8 +22,11 @@
 package org.workcraft.plugins.dfs;
 
 import org.workcraft.dom.math.MathNode;
+import org.workcraft.observation.PropertyChangedEvent;
 
 public class MathDelayNode extends MathNode {
+	public static final String PROPERTY_DELAY = "Delay";
+	
 	private double delay = 0.0;
 
 	public double getDelay() {
@@ -32,6 +35,7 @@
 
 	public void setDelay(double value) {
 		this.delay = value;
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_DELAY));
 	}
 	
 }
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/Register.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/Register.java	2013-11-13 10:32:32 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/Register.java	2015-06-26 22:23:53 +0000
@@ -25,6 +25,8 @@
 
 @VisualClass(org.workcraft.plugins.dfs.VisualRegister.class)
 public class Register extends MathDelayNode {
+	public static final String PROPERTY_MARKED = "Marked";
+	
 	private boolean marked = false;
 
 	public boolean isMarked() {
@@ -33,7 +35,7 @@
 
 	public void setMarked(boolean marked) {
 		this.marked = marked;
-		sendNotification(new PropertyChangedEvent(this, "marked"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_MARKED));
 	}
 
 }
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualAbstractRegister.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualAbstractRegister.java	2015-01-20 15:37:33 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualAbstractRegister.java	2015-06-26 22:23:53 +0000
@@ -4,9 +4,11 @@
 
 import org.workcraft.dom.visual.Stylable;
 import org.workcraft.gui.propertyeditor.PropertyDeclaration;
+import org.workcraft.observation.PropertyChangedEvent;
 import org.workcraft.plugins.shared.CommonVisualSettings;
 
 public abstract class VisualAbstractRegister extends VisualDelayComponent {
+	public static final String PROPERTY_TOKEN_COLOR = "Token color";
 	protected Color tokenColor = CommonVisualSettings.getBorderColor();
 	
 	public VisualAbstractRegister(MathDelayNode ref) {
@@ -16,7 +18,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualAbstractRegister, Color>(
-				this, "Token color", Color.class) {
+				this, PROPERTY_TOKEN_COLOR, Color.class) {
 			public void setter(VisualAbstractRegister object, Color value) {
 				object.setTokenColor(value);
 			}
@@ -32,6 +34,7 @@
 
 	public void setTokenColor(Color tokenColor) {
 		this.tokenColor = tokenColor;
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_TOKEN_COLOR));
 	}
 	
 	@Override
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualBinaryRegister.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualBinaryRegister.java	2015-01-20 15:37:33 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualBinaryRegister.java	2015-06-26 22:23:53 +0000
@@ -13,7 +13,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualBinaryRegister, Marking>(
-				this, "Marking", Marking.class) {
+				this, BinaryRegister.PROPERTY_MARKING, Marking.class) {
 			public void setter(VisualBinaryRegister object, Marking value) {
 				object.getReferencedBinaryRegister().setMarking(value);
 			}
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualControlConnection.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualControlConnection.java	2015-01-20 15:37:33 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualControlConnection.java	2015-06-26 22:23:53 +0000
@@ -24,7 +24,7 @@
 	private void addPropertyDeclarations() {
 		super.initialise();
 		addPropertyDeclaration(new PropertyDeclaration<VisualControlConnection, Boolean>(
-				this, "Inverting", Boolean.class) {
+				this, ControlConnection.PROPERTY_INVERTING, Boolean.class) {
 			public void setter(VisualControlConnection object, Boolean value) {
 				ControlConnection ref = getReferencedControlConnection();
 				// check if ref is not null to trick the order of node creation in deserialiser
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualControlRegister.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualControlRegister.java	2015-01-09 12:41:39 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualControlRegister.java	2015-06-26 22:23:53 +0000
@@ -32,7 +32,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualControlRegister, Double>(
-				this, "Probability", Double.class) { 
+				this, ControlRegister.PROPERTY_PROBABILITY, Double.class) { 
 			public void setter(VisualControlRegister object, Double value) {
 				object.getReferencedControlRegister().setProbability(value);
 			}
@@ -42,7 +42,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualControlRegister, SynchronisationType>(
-				this, "Synchronisation type", SynchronisationType.class) {
+				this, ControlRegister.PROPERTY_SYNCHRONISATION_TYPE, SynchronisationType.class) {
 			public void setter(VisualControlRegister object, SynchronisationType value) {
 				object.getReferencedControlRegister().setSynchronisationType(value);
 			}
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualCounterflowLogic.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualCounterflowLogic.java	2015-01-20 15:37:33 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualCounterflowLogic.java	2015-06-26 22:23:53 +0000
@@ -30,7 +30,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualCounterflowLogic, Boolean>(
-				this, "Forward Computed", Boolean.class) { 
+				this, CounterflowLogic.PROPERTY_FORWARD_COMPUTED, Boolean.class) { 
 			public void setter(VisualCounterflowLogic object, Boolean value) {
 				object.getReferencedCounterflowLogic().setForwardComputed(value);
 			}
@@ -40,7 +40,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualCounterflowLogic, Boolean>(
-				this, "Backward Computed", Boolean.class) { 
+				this, CounterflowLogic.PROPERTY_BACKWARD_COMPUTED, Boolean.class) { 
 			public void setter(VisualCounterflowLogic object, Boolean value) {
 				object.getReferencedCounterflowLogic().setBackwardComputed(value);
 			}
@@ -51,7 +51,7 @@
 
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualCounterflowLogic, Boolean>(
-				this, "Forward Early Evaluation", Boolean.class) {
+				this, CounterflowLogic.PROPERTY_FORWARD_EARLY_EVALUATION, Boolean.class) {
 			public void setter(VisualCounterflowLogic object, Boolean value) {
 				object.getReferencedCounterflowLogic().setForwardEarlyEvaluation(value);
 			}
@@ -61,7 +61,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualCounterflowLogic, Boolean>(
-				this, "Backward Early Evaluation", Boolean.class) { 
+				this, CounterflowLogic.PROPERTY_BACKWARD_EARLY_EVALUATION, Boolean.class) { 
 			public void setter(VisualCounterflowLogic object, Boolean value) {
 				object.getReferencedCounterflowLogic().setBackwardEarlyEvaluation(value);
 			}
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualCounterflowRegister.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualCounterflowRegister.java	2015-01-20 15:37:33 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualCounterflowRegister.java	2015-06-26 22:23:53 +0000
@@ -30,7 +30,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualCounterflowRegister, Boolean>(
-				this, "Or-marked", Boolean.class) {
+				this, CounterflowRegister.PROPERTY_OR_MARKED, Boolean.class) {
 			public void setter(VisualCounterflowRegister object, Boolean value) {
 				object.getReferencedCounterflowRegister().setOrMarked(value);
 			}
@@ -40,7 +40,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualCounterflowRegister, Boolean>(
-				this, "And-marked", Boolean.class) {
+				this, CounterflowRegister.PROPERTY_AND_MARKED, Boolean.class) {
 			public void setter(VisualCounterflowRegister object, Boolean value) {
 				object.getReferencedCounterflowRegister().setAndMarked(value);
 			}
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualDelayComponent.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualDelayComponent.java	2015-01-20 15:37:33 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualDelayComponent.java	2015-06-26 22:23:53 +0000
@@ -17,7 +17,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualDelayComponent, Double>(
-				this, "Delay", Double.class) { 
+				this, MathDelayNode.PROPERTY_DELAY, Double.class) { 
 			public void setter(VisualDelayComponent object, Double value) {
 				object.getReferencedDelayComponent().setDelay(value);
 			}
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualLogic.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualLogic.java	2015-01-20 15:37:33 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualLogic.java	2015-06-26 22:23:53 +0000
@@ -29,7 +29,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualLogic, Boolean>(
-				this, "Computed", Boolean.class) { 
+				this, Logic.PROPERTY_COMPUTED, Boolean.class) { 
 			public void setter(VisualLogic object, Boolean value) {
 				object.getReferencedLogic().setComputed(value);
 			}
@@ -39,7 +39,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualLogic, Boolean>(
-				this, "Early Evaluation", Boolean.class) { 
+				this, Logic.PROPERTY_EARLY_EVALUATION, Boolean.class) { 
 			public void setter(VisualLogic object, Boolean value) {
 				object.getReferencedLogic().setEarlyEvaluation(value);
 			}
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/VisualRegister.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/VisualRegister.java	2015-01-20 15:37:33 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/VisualRegister.java	2015-06-26 22:23:53 +0000
@@ -55,7 +55,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualRegister, Boolean>(
-				this, "Marked", Boolean.class) {
+				this, Register.PROPERTY_MARKED, Boolean.class) {
 			public void setter(VisualRegister object, Boolean value) {
 				object.getReferencedRegister().setMarked(value);
 			}
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tools/CheckDataflowDeadlockTool.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tools/CheckDataflowDeadlockTool.java	2015-04-23 12:19:54 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tools/CheckDataflowDeadlockTool.java	2015-06-26 22:23:53 +0000
@@ -16,7 +16,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tools/CheckDataflowHazardTool.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tools/CheckDataflowHazardTool.java	2015-04-23 12:19:54 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tools/CheckDataflowHazardTool.java	2015-06-26 22:23:53 +0000
@@ -15,7 +15,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tools/CheckDataflowTool.java'
--- DfsPlugin/src/org/workcraft/plugins/dfs/tools/CheckDataflowTool.java	2015-04-23 12:19:54 +0000
+++ DfsPlugin/src/org/workcraft/plugins/dfs/tools/CheckDataflowTool.java	2015-06-26 22:23:53 +0000
@@ -15,7 +15,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/Event.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/Event.java	2015-01-08 23:08:14 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/Event.java	2015-06-26 22:23:53 +0000
@@ -8,6 +8,7 @@
 @DisplayName("Event")
 @VisualClass(org.workcraft.plugins.fsm.VisualEvent.class)
 public class Event extends MathConnection {
+	public static final String PROPERTY_SYMBOL = "Symbol";
 
 	private Symbol symbol;
 
@@ -25,7 +26,7 @@
 
 	public void setSymbol(Symbol symbol) {
 		this.symbol = symbol;
-		sendNotification(new PropertyChangedEvent(this, "symbol"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_SYMBOL));
 	}
 	
 }
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/Fsm.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/Fsm.java	2015-05-27 12:14:35 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/Fsm.java	2015-06-26 22:23:53 +0000
@@ -1,6 +1,7 @@
 package org.workcraft.plugins.fsm;
 
 import java.util.Collection;
+import java.util.LinkedList;
 
 import org.workcraft.annotations.VisualClass;
 import org.workcraft.dom.Container;
@@ -12,6 +13,7 @@
 import org.workcraft.dom.references.ReferenceManager;
 import org.workcraft.exceptions.ArgumentException;
 import org.workcraft.gui.propertyeditor.ModelProperties;
+import org.workcraft.gui.propertyeditor.PropertyDescriptor;
 import org.workcraft.plugins.fsm.propertydescriptors.EventSymbolPropertyDescriptor;
 import org.workcraft.plugins.fsm.propertydescriptors.SymbolPropertyDescriptor;
 import org.workcraft.serialisation.References;
@@ -152,9 +154,11 @@
 	public ModelProperties getProperties(Node node) {
 		ModelProperties properties = super.getProperties(node);
 		if (node == null) {
+			LinkedList<PropertyDescriptor> symbolDescriptors = new LinkedList<>();
 			for (final Symbol symbol: getSymbols()) {
-				properties.add(new SymbolPropertyDescriptor(this, symbol));
+				symbolDescriptors.add(new SymbolPropertyDescriptor(this, symbol));
 			}
+			properties.addSorted(symbolDescriptors);
 		} else if (node instanceof Event) {
 			Event event = (Event) node;
 			properties.add(new EventSymbolPropertyDescriptor(this, event));
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/InitialStateSupervisor.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/InitialStateSupervisor.java	2015-04-23 12:19:54 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/InitialStateSupervisor.java	2015-06-26 22:23:53 +0000
@@ -21,7 +21,7 @@
 		if (e instanceof PropertyChangedEvent) {
 			PropertyChangedEvent pce = (PropertyChangedEvent)e;
 			Object sender = e.getSender();
-			if ((sender instanceof State) && pce.getPropertyName().equals("initial")) {
+			if ((sender instanceof State) && pce.getPropertyName().equals(State.PROPERTY_INITIAL)) {
 				// Update all the states on a change of the initial property 
 				handleInitialStateChange((State)sender);
 			}
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/State.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/State.java	2014-12-13 22:56:43 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/State.java	2015-06-26 22:23:53 +0000
@@ -8,6 +8,9 @@
 @DisplayName("State")
 @VisualClass(org.workcraft.plugins.fsm.VisualState.class)
 public class State extends MathNode {
+	public static final String PROPERTY_INITIAL = "Initial";
+	public static final String PROPERTY_FINAL = "Final";
+	
 	private boolean initialState = false;
 	private boolean finalState = false;
 
@@ -17,7 +20,7 @@
 
 	public void setInitial(boolean value) {
 		if (setInitialQuiet(value)) {
-			sendNotification(new PropertyChangedEvent(this, "initial"));
+			sendNotification(new PropertyChangedEvent(this, PROPERTY_INITIAL));
 		}
 	}
 
@@ -36,7 +39,7 @@
 	public void setFinal(boolean value) {
 		if (finalState != value) {
 			finalState = value;
-			sendNotification(new PropertyChangedEvent(this, "final"));
+			sendNotification(new PropertyChangedEvent(this, PROPERTY_FINAL));
 		}
 	}
 
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/SymbolConsistencySupervisor.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/SymbolConsistencySupervisor.java	2015-01-15 18:02:07 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/SymbolConsistencySupervisor.java	2015-06-26 22:23:53 +0000
@@ -21,7 +21,7 @@
 		if (e instanceof PropertyChangedEvent) {
 			PropertyChangedEvent pce = (PropertyChangedEvent)e;
 			Object sender = e.getSender();
-			if ((sender instanceof Event) && pce.getPropertyName().equals("symbol")) {
+			if ((sender instanceof Event) && pce.getPropertyName().equals(Event.PROPERTY_SYMBOL)) {
 				// Update the collection of symbols on a change of event symbol property
 				handleEventSymbolChange((Event)sender);
 			}
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/VisualEvent.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/VisualEvent.java	2015-04-13 18:41:37 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/VisualEvent.java	2015-06-26 22:23:53 +0000
@@ -16,10 +16,13 @@
 import org.workcraft.gui.Coloriser;
 import org.workcraft.gui.graph.tools.Decoration;
 import org.workcraft.gui.propertyeditor.PropertyDeclaration;
+import org.workcraft.observation.PropertyChangedEvent;
 import org.workcraft.plugins.shared.CommonVisualSettings;
 import org.workcraft.util.Geometry;
 
 public class VisualEvent extends VisualConnection {
+	public static final String PROPERTY_LABEL_COLOR = "Label color";
+
 	// Epsilon symbol in UTF-8 encoding (avoid inserting UTF symbols directly in the source code). 
 	public static final char EPSILON_SYMBOL = 0x03B5;
 	
@@ -43,7 +46,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualEvent, Color>(
-				this, "Label color", Color.class) {
+				this, PROPERTY_LABEL_COLOR, Color.class) {
 			protected void setter(VisualEvent object, Color value) {
 				object.setLabelColor(value);
 			}
@@ -144,6 +147,7 @@
 
 	public void setLabelColor(Color symbolColor) {
 		this.labelColor = symbolColor;
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_LABEL_COLOR));
 	}
 	
 }
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/VisualState.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/VisualState.java	2015-04-13 18:41:37 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/VisualState.java	2015-06-26 22:23:53 +0000
@@ -32,7 +32,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualState, Boolean>(
-				this, "Initial", Boolean.class, true, false, false) { 
+				this, State.PROPERTY_INITIAL, Boolean.class, true, false, false) { 
 			public void setter(VisualState object, Boolean value) {
 				object.getReferencedState().setInitial(value);
 			}
@@ -42,7 +42,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualState, Boolean>(
-				this, "Final", Boolean.class, true, true, true) { 
+				this, State.PROPERTY_FINAL, Boolean.class, true, true, true) { 
 			public void setter(VisualState object, Boolean value) {
 				object.getReferencedState().setFinal(value);
 			}
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/propertydescriptors/EventSymbolPropertyDescriptor.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/propertydescriptors/EventSymbolPropertyDescriptor.java	2015-04-13 18:41:37 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/propertydescriptors/EventSymbolPropertyDescriptor.java	2015-06-26 22:23:53 +0000
@@ -25,7 +25,7 @@
 
 	@Override
 	public String getName() {
-		return "Symbol";
+		return Event.PROPERTY_SYMBOL;
 	}
 
 	@Override
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/propertydescriptors/SymbolPropertyDescriptor.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/propertydescriptors/SymbolPropertyDescriptor.java	2015-04-13 18:41:37 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/propertydescriptors/SymbolPropertyDescriptor.java	2015-06-26 22:23:53 +0000
@@ -62,7 +62,7 @@
     	if (node == null) {
     		fsm.setName(symbol, name);
     		for (Event event: fsm.getEvents(symbol)) {
-    			event.sendNotification(new PropertyChangedEvent(event, "symbol"));
+    			event.sendNotification(new PropertyChangedEvent(event, Event.PROPERTY_SYMBOL));
     		}
     	} else if (node instanceof Symbol) {
     	} else {
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/tools/DeadlockCheckerTool.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/tools/DeadlockCheckerTool.java	2015-01-26 12:46:03 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/tools/DeadlockCheckerTool.java	2015-06-26 22:23:53 +0000
@@ -22,7 +22,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/tools/DeterminismCheckerTool.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/tools/DeterminismCheckerTool.java	2015-01-26 12:46:03 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/tools/DeterminismCheckerTool.java	2015-06-26 22:23:53 +0000
@@ -21,7 +21,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/tools/ReachabilityCheckerTool.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/tools/ReachabilityCheckerTool.java	2015-01-26 12:46:03 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/tools/ReachabilityCheckerTool.java	2015-06-26 22:23:53 +0000
@@ -22,7 +22,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'FsmPlugin/src/org/workcraft/plugins/fsm/tools/ReversibilityCheckerTool.java'
--- FsmPlugin/src/org/workcraft/plugins/fsm/tools/ReversibilityCheckerTool.java	2015-01-26 12:46:03 +0000
+++ FsmPlugin/src/org/workcraft/plugins/fsm/tools/ReversibilityCheckerTool.java	2015-06-26 22:23:53 +0000
@@ -22,7 +22,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/Fst.java'
--- FstPlugin/src/org/workcraft/plugins/fst/Fst.java	2015-04-13 18:41:37 +0000
+++ FstPlugin/src/org/workcraft/plugins/fst/Fst.java	2015-06-26 22:23:53 +0000
@@ -1,6 +1,7 @@
 package org.workcraft.plugins.fst;
 
 import java.util.Collection;
+import java.util.LinkedList;
 
 import org.workcraft.annotations.VisualClass;
 import org.workcraft.dom.Container;
@@ -8,6 +9,7 @@
 import org.workcraft.dom.references.HierarchicalUniqueNameReferenceManager;
 import org.workcraft.exceptions.ArgumentException;
 import org.workcraft.gui.propertyeditor.ModelProperties;
+import org.workcraft.gui.propertyeditor.PropertyDescriptor;
 import org.workcraft.observation.PropertyChangedEvent;
 import org.workcraft.observation.StateEvent;
 import org.workcraft.observation.StateSupervisor;
@@ -33,9 +35,9 @@
 			if (e instanceof PropertyChangedEvent) {
 				PropertyChangedEvent pce = (PropertyChangedEvent)e;
 				Object sender = e.getSender();
-				if ((sender instanceof Signal) && pce.getPropertyName().equals("type")) {
+				if ((sender instanceof Signal) && pce.getPropertyName().equals(Signal.PROPERTY_TYPE)) {
 					for (Event event: getEvents((Signal)sender)) {
-						event.sendNotification(new PropertyChangedEvent(event, "type"));
+						event.sendNotification(new PropertyChangedEvent(event, Signal.PROPERTY_TYPE));
 					}
 				}
 			}
@@ -123,19 +125,22 @@
 	public ModelProperties getProperties(Node node) {
 		ModelProperties properties = super.getProperties(node);
 		if (node == null) {
+			LinkedList<PropertyDescriptor> signalDescriptors= new LinkedList<>();
 			for (final Signal signal: getSignals()) {
-				properties.add(new SignalTypePropertyDescriptor(this, signal));
+				signalDescriptors.add(new SignalTypePropertyDescriptor(this, signal));
 			}
-			properties.sortByPropertyName();
+			properties.addSorted(signalDescriptors);
 		} else if (node instanceof SignalEvent) {
+			LinkedList<PropertyDescriptor> eventDescriptors= new LinkedList<>();
 			SignalEvent signalEvent = (SignalEvent) node;
-			properties.add(new EventSignalPropertyDescriptor(this, signalEvent));
+			eventDescriptors.add(new EventSignalPropertyDescriptor(this, signalEvent));
 			Signal signal = signalEvent.getSignal();
-			properties.add(new TypePropertyDescriptor(signal));
+			eventDescriptors.add(new TypePropertyDescriptor(signal));
 			if (signal.hasDirection()) {
-				properties.add(new DirectionPropertyDescriptor(signalEvent));
+				eventDescriptors.add(new DirectionPropertyDescriptor(signalEvent));
 			}
-			properties.removeByName("Symbol");
+			properties.addSorted(eventDescriptors);
+			properties.removeByName(Event.PROPERTY_SYMBOL);
 		}
 		return properties;
 	}
 
=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/Signal.java'
--- FstPlugin/src/org/workcraft/plugins/fst/Signal.java	2015-01-12 22:09:40 +0000
+++ FstPlugin/src/org/workcraft/plugins/fst/Signal.java	2015-06-26 22:23:53 +0000
@@ -6,6 +6,8 @@
 
 public class Signal extends Symbol {
 	
+	public static final String PROPERTY_TYPE = "Type";
+
 	public enum Type {
 		INPUT("input"),
 		OUTPUT("output"),
@@ -44,7 +46,7 @@
 
 	public void setType(Type type) {
 		this.type = type;
-		sendNotification(new PropertyChangedEvent(this, "type"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_TYPE));
 	}
 	
 	public boolean hasDirection() {
 
=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/SignalEvent.java'
--- FstPlugin/src/org/workcraft/plugins/fst/SignalEvent.java	2015-01-12 22:09:40 +0000
+++ FstPlugin/src/org/workcraft/plugins/fst/SignalEvent.java	2015-06-26 22:23:53 +0000
@@ -11,6 +11,8 @@
 @VisualClass(org.workcraft.plugins.fst.VisualSignalEvent.class)
 public class SignalEvent extends Event {
 
+	public static final String PROPERTY_DIRECTION = "Direction";
+
 	public enum Direction {
 		PLUS("+"),
 		MINUS("-"),
@@ -52,7 +54,7 @@
 
 	public void setDirection(Direction direction) {
 		this.direction = direction;
-		sendNotification(new PropertyChangedEvent(this, "direction"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_DIRECTION));
 	}
 	
 	public Signal getSignal() {
 
=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/propertydescriptors/DirectionPropertyDescriptor.java'
--- FstPlugin/src/org/workcraft/plugins/fst/propertydescriptors/DirectionPropertyDescriptor.java	2015-04-13 18:41:37 +0000
+++ FstPlugin/src/org/workcraft/plugins/fst/propertydescriptors/DirectionPropertyDescriptor.java	2015-06-26 22:23:53 +0000
@@ -18,7 +18,7 @@
 
 	@Override
 	public String getName() {
-		return "Direction";
+		return SignalEvent.PROPERTY_DIRECTION;
 	}
 
 	@Override
 
=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/propertydescriptors/TypePropertyDescriptor.java'
--- FstPlugin/src/org/workcraft/plugins/fst/propertydescriptors/TypePropertyDescriptor.java	2015-04-13 18:41:37 +0000
+++ FstPlugin/src/org/workcraft/plugins/fst/propertydescriptors/TypePropertyDescriptor.java	2015-06-26 22:23:53 +0000
@@ -9,6 +9,7 @@
 import org.workcraft.plugins.fst.Signal.Type;
 
 public class TypePropertyDescriptor implements PropertyDescriptor  {
+	
 	private final Signal signal;
 	
 	public TypePropertyDescriptor(Signal signal) {
@@ -17,7 +18,7 @@
 
 	@Override
 	public String getName() {
-		return "Signal type";
+		return Signal.PROPERTY_TYPE;
 	}
 
 	@Override
 
=== modified file 'FstPlugin/src/org/workcraft/plugins/fst/tools/FstSimulationTool.java'
--- FstPlugin/src/org/workcraft/plugins/fst/tools/FstSimulationTool.java	2015-05-27 12:14:35 +0000
+++ FstPlugin/src/org/workcraft/plugins/fst/tools/FstSimulationTool.java	2015-06-26 22:23:53 +0000
@@ -37,7 +37,7 @@
 	@Override
 	public void activated(final GraphEditor editor) {
 		super.activated(editor);
-		setStatePaneVisibility(false);
+		setStatePaneVisibility(true);
 	}
 	
 	@Override
 
=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/AbstractMpsatChecker.java'
--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/AbstractMpsatChecker.java	2015-04-23 12:19:54 +0000
+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/AbstractMpsatChecker.java	2015-06-26 22:23:53 +0000
@@ -11,7 +11,7 @@
 	
 	@Override
 	public final String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 	
 	@Override
 
=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatConformationChecker.java'
--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatConformationChecker.java	2015-04-23 12:19:54 +0000
+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatConformationChecker.java	2015-06-26 22:23:53 +0000
@@ -16,7 +16,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatCustomPropertyChecker.java'
--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatCustomPropertyChecker.java	2015-04-30 23:14:48 +0000
+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatCustomPropertyChecker.java	2015-06-26 22:23:53 +0000
@@ -20,7 +20,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatSynthesis.java'
--- MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatSynthesis.java	2015-04-28 22:14:55 +0000
+++ MpsatPlugin/src/org/workcraft/plugins/mpsat/tools/MpsatSynthesis.java	2015-06-26 22:23:53 +0000
@@ -20,7 +20,7 @@
 
 	@Override
 	public String getSection() {
-		return "Synthesis";
+		return "!Synthesis";
 	}
 
 	@Override
 
=== modified file 'PetriNetPlugin/src/org/workcraft/plugins/petri/Place.java'
--- PetriNetPlugin/src/org/workcraft/plugins/petri/Place.java	2013-07-25 12:29:40 +0000
+++ PetriNetPlugin/src/org/workcraft/plugins/petri/Place.java	2015-06-26 22:23:53 +0000
@@ -28,6 +28,9 @@
 
 @VisualClass(org.workcraft.plugins.petri.VisualPlace.class)
 public class Place extends MathNode {
+	public static final String PROPERTY_CAPACITY = "Capacity";
+	public static final String PROPERTY_TOKENS = "Tokens";
+	
 	protected int tokens = 0;
 	protected int capacity = 1;
 	
@@ -43,7 +46,7 @@
 			capacity = tokens;
 		}
 		this.tokens = tokens;
-		sendNotification( new PropertyChangedEvent(this, "tokens") );
+		sendNotification( new PropertyChangedEvent(this, PROPERTY_TOKENS) );
 	}
 
 	public int getCapacity() {
@@ -58,6 +61,6 @@
 			throw new ArgumentException("The place capacity "+ capacity + " is too small for the current number of tokens " + tokens + " .");
 		}
 		this.capacity = capacity;
-		sendNotification ( new PropertyChangedEvent (this, "capacity"));
+		sendNotification ( new PropertyChangedEvent (this, PROPERTY_CAPACITY));
 	}
 }
 
=== modified file 'PetriNetPlugin/src/org/workcraft/plugins/petri/VisualPlace.java'
--- PetriNetPlugin/src/org/workcraft/plugins/petri/VisualPlace.java	2014-12-18 16:28:25 +0000
+++ PetriNetPlugin/src/org/workcraft/plugins/petri/VisualPlace.java	2015-06-26 22:23:53 +0000
@@ -48,6 +48,7 @@
 @Hotkey(KeyEvent.VK_P)
 @SVGIcon("images/icons/svg/place.svg")
 public class VisualPlace extends VisualComponent {
+	public static final String PROPERTY_TOKEN_COLOR = "Token color";
 	protected static double singleTokenSize = CommonVisualSettings.getBaseSize() / 1.9;
 	protected static double multipleTokenSeparation = CommonVisualSettings.getStrokeWidth() / 8;
 	protected Color tokenColor = CommonVisualSettings.getBorderColor();
@@ -59,7 +60,7 @@
 	
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualPlace, Integer>(
-				this, "Tokens", Integer.class) {
+				this, Place.PROPERTY_TOKENS, Integer.class) {
 			public void setter(VisualPlace object, Integer value) {
 				object.getReferencedPlace().setTokens(value);
 			}
@@ -69,7 +70,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualPlace, Color>(
-				this, "Token color", Color.class) {
+				this, PROPERTY_TOKEN_COLOR, Color.class) {
 			public void setter(VisualPlace object, Color value) {
 				object.setTokenColor(value);
 			}
@@ -79,7 +80,7 @@
 		});
 		
 		addPropertyDeclaration(new PropertyDeclaration<VisualPlace, Integer>(
-				this, "Capacity", Integer.class) {
+				this, Place.PROPERTY_CAPACITY, Integer.class) {
 			public void setter(VisualPlace object, Integer value) {
 				object.getReferencedPlace().setCapacity(value);
 			}
@@ -185,7 +186,7 @@
 
 	public void setTokenColor(Color tokenColor) {
 		this.tokenColor = tokenColor;
-		sendNotification(new PropertyChangedEvent(this, "token color"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_TOKEN_COLOR));
 	}
 
 	@Override
 
=== modified file 'PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java'
--- PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java	2015-05-27 12:14:35 +0000
+++ PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetSimulationTool.java	2015-06-26 22:23:53 +0000
@@ -67,6 +67,7 @@
 import org.workcraft.dom.Container;
 import org.workcraft.dom.Node;
 import org.workcraft.dom.math.MathModel;
+import org.workcraft.dom.visual.FontHelper;
 import org.workcraft.dom.visual.HitMan;
 import org.workcraft.dom.visual.VisualGroup;
 import org.workcraft.dom.visual.VisualModel;
@@ -82,6 +83,7 @@
 import org.workcraft.gui.graph.tools.Decorator;
 import org.workcraft.gui.graph.tools.GraphEditor;
 import org.workcraft.gui.layouts.WrapLayout;
+import org.workcraft.gui.propertyeditor.PropertyEditorTable;
 import org.workcraft.plugins.petri.PetriNetModel;
 import org.workcraft.plugins.petri.Place;
 import org.workcraft.plugins.petri.Transition;
@@ -177,6 +179,7 @@
 
 		traceTable = new JTable(new TraceTableModel());
 		traceTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		traceTable.setRowHeight(FontHelper.getFontSizeInPixels(traceTable.getFont()));
 		traceTable.setDefaultRenderer(Object.class,	new TraceTableCellRendererImplementation());
 		
 		tracePane = new JScrollPane();
@@ -687,10 +690,10 @@
 	private final class TraceTableCellRendererImplementation implements TableCellRenderer {
 		private final JLabel label = new JLabel() {
 			@Override
-			public void paint( Graphics g ) {
-				g.setColor( getBackground() );
-				g.fillRect( 0, 0, getWidth() - 1, getHeight() - 1 );
-				super.paint( g );
+			public void paint(Graphics g) {
+				g.setColor(getBackground());
+				g.fillRect(0, 0, getWidth() - 1, getHeight() - 1);
+				super.paint(g);
 			}
 		};
 
@@ -700,7 +703,8 @@
 					return row == mainTrace.getPosition();
 				}
 			} else {
-				if (!branchTrace.isEmpty() && (row >= mainTrace.getPosition()) && (row < mainTrace.getPosition() + branchTrace.size())) {
+				if (!branchTrace.isEmpty() && (row >= mainTrace.getPosition()) 
+						&& (row < mainTrace.getPosition() + branchTrace.size())) {
 					return (row == mainTrace.getPosition() + branchTrace.getPosition());
 				}
 			}
@@ -711,13 +715,15 @@
 		public Component getTableCellRendererComponent(JTable table, Object value, 
 				boolean isSelected, boolean hasFocus,	int row, int column) {
 			JLabel result = null;
+			label.setBorder(PropertyEditorTable.BORDER_RENDER);
 			if ((net != null) && (value instanceof String)) {
 				label.setText((String) value);
-				label.setForeground(Color.BLACK);
 				if (isActive(row, column)) {
-					label.setBackground(Color.YELLOW);
+					label.setForeground(table.getSelectionForeground());
+					label.setBackground(table.getSelectionBackground());
 				} else {
-					label.setBackground(Color.WHITE);
+					label.setForeground(table.getForeground());
+					label.setBackground(table.getBackground());
 				}
 				result = label;
 			}
 
=== modified file 'PetrifyPlugin/src/org/workcraft/plugins/petrify/tools/PetrifySynthesis.java'
--- PetrifyPlugin/src/org/workcraft/plugins/petrify/tools/PetrifySynthesis.java	2015-04-28 22:14:55 +0000
+++ PetrifyPlugin/src/org/workcraft/plugins/petrify/tools/PetrifySynthesis.java	2015-06-26 22:23:53 +0000
@@ -20,7 +20,7 @@
 
 	@Override
 	public String getSection() {
-		return "Synthesis";
+		return "!Synthesis";
 	}
 
 	@Override
@@ -30,7 +30,7 @@
 
 	@Override
 	public void run(WorkspaceEntry we) {
-		// call petrify asynchronous (w/o blocking the GUI) 
+		// Call Petrify asynchronously (without blocking the GUI) 
 		try {
 			File instgFile = getInputSTG(WorkspaceUtils.getAs(we, STGModel.class));
 			File eqnFile = File.createTempFile("petrifyEquations", ".eqn");
 
=== modified file 'PolicyNetPlugin/src/org/workcraft/plugins/policy/Bundle.java'
--- PolicyNetPlugin/src/org/workcraft/plugins/policy/Bundle.java	2013-10-31 11:44:01 +0000
+++ PolicyNetPlugin/src/org/workcraft/plugins/policy/Bundle.java	2015-06-26 22:23:53 +0000
@@ -9,21 +9,26 @@
 import org.workcraft.observation.PropertyChangedEvent;
 
 public class Bundle extends MathNode  {
+	public static final String PROPERTY_ADDED = "added";
+	public static final String PROPERTY_REMOVED = "removed";
+	public static final String PROPERTY_BUNDLED = "bundled";
+	public static final String PROPERTY_UNBUNDLED = "unbundled";
+
 	private final Set<BundledTransition> transitions = new HashSet<BundledTransition>();
 
 	public void add(BundledTransition transition) {
 		if (transition != null) {
 			transitions.add(transition);
-			sendNotification(new PropertyChangedEvent(this, "added"));
-			transition.sendNotification(new PropertyChangedEvent(this, "bundled"));
+			sendNotification(new PropertyChangedEvent(this, PROPERTY_ADDED));
+			transition.sendNotification(new PropertyChangedEvent(this, PROPERTY_BUNDLED));
 		}
 	}
 	
 	public void remove(BundledTransition transition) {
 		if (contains(transition)) {
 			transitions.remove(transition);
-			sendNotification(new PropertyChangedEvent(this, "removed"));
-			transition.sendNotification(new PropertyChangedEvent(this, "unbundled"));
+			sendNotification(new PropertyChangedEvent(this, PROPERTY_REMOVED));
+			transition.sendNotification(new PropertyChangedEvent(this, PROPERTY_UNBUNDLED));
 		}
 	}
 
 
=== modified file 'PolicyNetPlugin/src/org/workcraft/plugins/policy/VisualBundle.java'
--- PolicyNetPlugin/src/org/workcraft/plugins/policy/VisualBundle.java	2014-01-28 17:11:19 +0000
+++ PolicyNetPlugin/src/org/workcraft/plugins/policy/VisualBundle.java	2015-06-26 22:23:53 +0000
@@ -48,6 +48,8 @@
 
 @DisplayName ("Bundle")
 public class VisualBundle extends VisualNode implements Drawable, DependentNode {
+	public static final String PROPERTY_COLOR = "color";
+	
 	private Bundle bundle;
 	protected double strokeWidth = CommonVisualSettings.getStrokeWidth();
 	private Color color = CieColorUtils.getLabColor(0.7f, (float)Math.random(), (float)Math.random());
@@ -142,7 +144,7 @@
 
 	public void setColor(Color value) {
 		this.color = value;
-		sendNotification(new PropertyChangedEvent(this, "color"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_COLOR));
 	}
 
 	public Color getColor() {
 
=== modified file 'PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/CheckDeadlockTool.java'
--- PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/CheckDeadlockTool.java	2015-04-23 12:19:54 +0000
+++ PolicyNetPlugin/src/org/workcraft/plugins/policy/tools/CheckDeadlockTool.java	2015-06-26 22:23:53 +0000
@@ -16,7 +16,7 @@
 
 	@Override
 	public String getSection() {
-		return "Verification";
+		return "!Verification";
 	}
 
 	@Override
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/gui/OutputArea.java'
--- SONPlugin/src/org/workcraft/plugins/son/gui/OutputArea.java	2014-11-24 18:55:08 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/gui/OutputArea.java	2015-06-26 22:23:53 +0000
@@ -80,7 +80,7 @@
 	        	myfile=new File(myfile.getAbsolutePath().concat(".txt")); 
 	        }      
         }
-        if(myfile==null || myfile.getName().equals(""))
+        if(myfile==null || myfile.getName().isEmpty())
         {
             JOptionPane.showMessageDialog(this,"Please enter a file name!","Error",JOptionPane.ERROR_MESSAGE);
             return;
 
=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/DummyTransition.java'
--- STGPlugin/src/org/workcraft/plugins/stg/DummyTransition.java	2014-11-07 18:09:40 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/DummyTransition.java	2015-06-26 22:23:53 +0000
@@ -29,12 +29,13 @@
 @DisplayName("Dummy transition")
 @VisualClass(org.workcraft.plugins.stg.VisualDummyTransition.class)
 public class DummyTransition extends NamedTransition {
+	public static final String PROPERTY_NAME = "Name";
 	private String name;
 	
 	@NoAutoSerialisation
 	public void setName(String name) {
 		this.name = name;
-		sendNotification(new PropertyChangedEvent(this, "name"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_NAME));
 	}
 
 	@NoAutoSerialisation
 
=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/SignalTransition.java'
--- STGPlugin/src/org/workcraft/plugins/stg/SignalTransition.java	2015-01-09 12:41:39 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/SignalTransition.java	2015-06-26 22:23:53 +0000
@@ -31,6 +31,10 @@
 @VisualClass(org.workcraft.plugins.stg.VisualSignalTransition.class)
 public class SignalTransition extends NamedTransition 
 {
+	public static final String PROPERTY_SIGNAL_TYPE = "Signal type";
+	public static final String PROPERTY_SIGNAL_NAME = "Signal name";
+	public static final String PROPERTY_DIRECTION = "Direction";
+
 	public enum Type {
 		INPUT("input"),
 		OUTPUT("output"),
@@ -85,7 +89,7 @@
 	public void setSignalType(Type type) {
 		if (this.type != type) {
 			this.type = type;
-			sendNotification(new PropertyChangedEvent(this, "signalType"));
+			sendNotification(new PropertyChangedEvent(this, PROPERTY_SIGNAL_TYPE));
 		}
 	}
 
@@ -96,7 +100,7 @@
 	public void setDirection(Direction direction) {
 		if (this.direction != direction) {
 			this.direction = direction;
-			sendNotification(new PropertyChangedEvent(this, "direction"));
+			sendNotification(new PropertyChangedEvent(this, PROPERTY_DIRECTION));
 		}
 	}
 
@@ -108,7 +112,7 @@
 	@NoAutoSerialisation
 	public void setSignalName(String signalName) {
 		this.signalName = signalName;
-		sendNotification(new PropertyChangedEvent(this, "signalName"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_SIGNAL_NAME));
 	}
 	
 	@NoAutoSerialisation
 
=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/SignalTypeConsistencySupervisor.java'
--- STGPlugin/src/org/workcraft/plugins/stg/SignalTypeConsistencySupervisor.java	2015-01-15 18:02:07 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/SignalTypeConsistencySupervisor.java	2015-06-26 22:23:53 +0000
@@ -42,18 +42,19 @@
 	public void handleEvent(StateEvent e) {
 		if (e instanceof PropertyChangedEvent) {
 			PropertyChangedEvent pce = (PropertyChangedEvent)e;
-			if (pce.getPropertyName().equals("signalType") || pce.getPropertyName().equals("signalName")) {
+			String propertyName = pce.getPropertyName();
+			if (propertyName.equals(SignalTransition.PROPERTY_SIGNAL_TYPE) || propertyName.equals(SignalTransition.PROPERTY_SIGNAL_NAME)) {
 				SignalTransition t = (SignalTransition)e.getSender();
 				String signalName = t.getSignalName();
 				Container container = (Container)t.getParent();
 				SignalTransition.Type signalType = t.getSignalType();
 				final Collection<SignalTransition> transitions = stg.getSignalTransitions(signalName, container);
-				if (pce.getPropertyName().equals("signalType")) {
+				if (propertyName.equals(SignalTransition.PROPERTY_SIGNAL_TYPE)) {
 					for (SignalTransition tt : transitions) {
 						tt.setSignalType(signalType);
 					}
 				}
-				if (pce.getPropertyName().equals("signalName")) {
+				if (propertyName.equals(SignalTransition.PROPERTY_SIGNAL_NAME)) {
 					for (SignalTransition tt : transitions) {
 						if (tt == t) continue;
 						t.setSignalType(tt.getSignalType());
 
=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/VisualImplicitPlaceArc.java'
--- STGPlugin/src/org/workcraft/plugins/stg/VisualImplicitPlaceArc.java	2014-12-16 18:20:48 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/VisualImplicitPlaceArc.java	2015-06-26 22:23:53 +0000
@@ -78,7 +78,7 @@
 	
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualImplicitPlaceArc, Integer>(
-				this, "Tokens", Integer.class) {
+				this, Place.PROPERTY_TOKENS, Integer.class) {
 			public void setter(VisualImplicitPlaceArc object, Integer value) {
 				object.getImplicitPlace().setTokens(value);
 			}
@@ -88,7 +88,7 @@
 		});
 		
 		addPropertyDeclaration(new PropertyDeclaration<VisualImplicitPlaceArc, Integer>(
-				this, "Capacity", Integer.class) {
+				this, Place.PROPERTY_CAPACITY, Integer.class) {
 			public void setter(VisualImplicitPlaceArc object, Integer value) {
 				object.getImplicitPlace().setCapacity(value);
 			}
@@ -98,7 +98,7 @@
 		});
 		
 		addPropertyDeclaration(new PropertyDeclaration<VisualImplicitPlaceArc, Color>(
-				this, "Token color", Color.class) {
+				this, VisualPlace.PROPERTY_TOKEN_COLOR, Color.class) {
 			public void setter(VisualImplicitPlaceArc object, Color value) {
 				object.setTokenColor(value);
 			}
@@ -182,7 +182,7 @@
 
 	public void setTokenColor(Color tokenColor) {
 		this.tokenColor = tokenColor;
-		sendNotification(new PropertyChangedEvent(this, "token color"));
+		sendNotification(new PropertyChangedEvent(this, VisualPlace.PROPERTY_TOKEN_COLOR));
 	}
 
 	@Override
 
=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/VisualSTG.java'
--- STGPlugin/src/org/workcraft/plugins/stg/VisualSTG.java	2015-05-06 21:13:09 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/VisualSTG.java	2015-06-26 22:23:53 +0000
@@ -47,6 +47,7 @@
 import org.workcraft.exceptions.InvalidConnectionException;
 import org.workcraft.exceptions.NodeCreationException;
 import org.workcraft.gui.propertyeditor.ModelProperties;
+import org.workcraft.gui.propertyeditor.PropertyDescriptor;
 import org.workcraft.plugins.petri.Place;
 import org.workcraft.plugins.petri.Transition;
 import org.workcraft.plugins.petri.VisualPlace;
@@ -335,12 +336,14 @@
 		ModelProperties properties = super.getProperties(node);
 		if (node == null) {
 			for (Type type : Type.values()) {
+				LinkedList<PropertyDescriptor> typeDescriptors = new LinkedList<>();
 				Container container = NamespaceHelper.getMathContainer(this, getCurrentLevel());  
 				for (final String signalName : stg.getSignalNames(type, container)) {
 					if (stg.getSignalTransitions(signalName, container).isEmpty()) continue;
-					properties.add(new SignalNamePropertyDescriptor(stg, signalName, container));
-					properties.add(new SignalTypePropertyDescriptor(stg, signalName, container));
+					typeDescriptors.add(new SignalNamePropertyDescriptor(stg, signalName, container));
+					typeDescriptors.add(new SignalTypePropertyDescriptor(stg, signalName, container));
 				}
+				properties.addSorted(typeDescriptors);
 			}
 		}
 		return properties;
 
=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/propertydescriptors/DirectionPropertyDescriptor.java'
--- STGPlugin/src/org/workcraft/plugins/stg/propertydescriptors/DirectionPropertyDescriptor.java	2015-04-13 18:41:37 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/propertydescriptors/DirectionPropertyDescriptor.java	2015-06-26 22:23:53 +0000
@@ -7,6 +7,7 @@
 import org.workcraft.dom.Node;
 import org.workcraft.gui.propertyeditor.PropertyDescriptor;
 import org.workcraft.plugins.stg.STG;
+import org.workcraft.plugins.stg.SignalTransition;
 import org.workcraft.plugins.stg.SignalTransition.Direction;
 
 public class DirectionPropertyDescriptor implements PropertyDescriptor {
@@ -20,7 +21,7 @@
 
 	@Override
 	public String getName() {
-		return "Direction";
+		return SignalTransition.PROPERTY_DIRECTION;
 	}
 
 	@Override
 
=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/propertydescriptors/TypePropertyDescriptor.java'
--- STGPlugin/src/org/workcraft/plugins/stg/propertydescriptors/TypePropertyDescriptor.java	2015-04-13 18:41:37 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/propertydescriptors/TypePropertyDescriptor.java	2015-06-26 22:23:53 +0000
@@ -10,6 +10,8 @@
 import org.workcraft.plugins.stg.SignalTransition.Type;
 
 public class TypePropertyDescriptor implements PropertyDescriptor  {
+	public static final String PROPERTY_SIGNAL_TYPE = "Signal type";
+
 	private final STG stg;
 	private final SignalTransition transition;
 	
@@ -20,7 +22,7 @@
 
 	@Override
 	public String getName() {
-		return "Signal type";
+		return PROPERTY_SIGNAL_TYPE;
 	}
 
 	@Override
 
=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/tools/StgSimulationTool.java'
--- STGPlugin/src/org/workcraft/plugins/stg/tools/StgSimulationTool.java	2015-05-27 12:14:35 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/tools/StgSimulationTool.java	2015-06-26 22:23:53 +0000
@@ -18,9 +18,11 @@
 import org.workcraft.dom.Connection;
 import org.workcraft.dom.Node;
 import org.workcraft.dom.hierarchy.NamespaceHelper;
+import org.workcraft.dom.visual.FontHelper;
 import org.workcraft.dom.visual.connections.VisualConnection;
 import org.workcraft.gui.Coloriser;
 import org.workcraft.gui.graph.tools.GraphEditor;
+import org.workcraft.gui.propertyeditor.PropertyEditorTable;
 import org.workcraft.plugins.petri.Transition;
 import org.workcraft.plugins.petri.VisualPlace;
 import org.workcraft.plugins.petri.VisualTransition;
@@ -73,7 +75,7 @@
 	}
 
 	private final class StateTableCellRendererImplementation implements	TableCellRenderer {
-		JLabel label = new JLabel() {
+		final JLabel label = new JLabel() {
 			@Override
 			public void paint(Graphics g) {
 				g.setColor(getBackground());
@@ -86,21 +88,25 @@
 		public Component getTableCellRendererComponent(JTable table, Object value, 
 				boolean isSelected, boolean hasFocus, int row, int column) {
 			JLabel result = null;
+			label.setBorder(PropertyEditorTable.BORDER_RENDER);
+			label.setBackground(table.getBackground());
 			if ((net != null) && (value instanceof SignalState)) {
 				SignalState st = (SignalState)value;
 				if (column == 0) {
 					label.setText(st.name);
 					label.setForeground(st.color);
-					label.setFont(label.getFont().deriveFont(Font.PLAIN));
+					Font plainFont = table.getFont().deriveFont(Font.PLAIN);
+					label.setFont(plainFont);
 				} else {
 					if (st.value < 0) {
 						label.setText("?");
 					} else {
 						label.setText(Integer.toString(st.value));
 					}
-					label.setForeground(Color.BLACK);
+					label.setForeground(table.getForeground());
 					if (st.excited) {
-						label.setFont(label.getFont().deriveFont(Font.BOLD));
+						Font boldFont = table.getFont().deriveFont(Font.BOLD);
+						label.setFont(boldFont);
 					}
 				}
 				result = label;
@@ -138,18 +144,19 @@
 		public Component getTableCellRendererComponent(JTable table, Object value, 
 				boolean isSelected, boolean hasFocus,	int row, int column) {
 			JLabel result = null;
+			label.setBorder(PropertyEditorTable.BORDER_RENDER);
 			if ((net != null) && (value instanceof String)) {
-				label.setText((String) value);
-				Node node = net.getNodeByReference((String) value);
+				label.setText(value.toString());
+				Node node = net.getNodeByReference(value.toString());
 				if (node instanceof SignalTransition) {
 					SignalTransition st = (SignalTransition)node;
 					Color color = getTypeColor(st.getSignalType());
 					label.setForeground(color);
 				}
 				if (isActive(row, column)) {
-					label.setBackground(Color.YELLOW);
+					label.setBackground(table.getSelectionBackground());
 				} else {
-					label.setBackground(Color.WHITE);
+					label.setBackground(table.getBackground());
 				}
 				result = label;
 			}
@@ -161,13 +168,11 @@
 	public void createInterfacePanel(final GraphEditor editor) {
 		super.createInterfacePanel(editor);
 		stateMap = new HashMap<String, SignalState>();
-		
 		stateTable = new JTable(new StateTableModel());
 		stateTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		stateTable.setRowHeight(FontHelper.getFontSizeInPixels(stateTable.getFont()));
 		stateTable.setDefaultRenderer(Object.class,	new StateTableCellRendererImplementation());
-
 		statePane.setViewportView(stateTable);
-
 		traceTable.setDefaultRenderer(Object.class, new TraceTableCellRendererImplementation());
 	}
 	
@@ -240,8 +245,9 @@
 	public void activated(final GraphEditor editor) {
 		super.activated(editor);
 		initialiseStateMap();
+		setStatePaneVisibility(true);
 	}
-	
+
 	public String getTraceLabelByReference(String ref) {
 		String result = null;
 		if (ref != null) {
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/hierarchy/NamespaceHelper.java'
--- WorkcraftCore/src/org/workcraft/dom/hierarchy/NamespaceHelper.java	2015-05-14 18:00:15 +0000
+++ WorkcraftCore/src/org/workcraft/dom/hierarchy/NamespaceHelper.java	2015-06-26 22:23:53 +0000
@@ -45,7 +45,7 @@
 		
 		String head = getReferenceHead(reference);
 		String tail = getReferenceTail(reference);
-		if (tail.equals("")) { 
+		if (tail.isEmpty()) { 
 			return ret+head;
 		}
 		return ret + head + hierarchicalToFlatName(tail, flatSeparator, false);
@@ -63,7 +63,7 @@
 	}
 	
 	public static void splitReference(String reference, LinkedList<String> path) {
-		if (reference.equals("")) return;
+		if (reference.isEmpty()) return;
 		
 		Matcher matcher = hPattern.matcher(reference);
 		if (matcher.find()) {
@@ -127,7 +127,7 @@
 	public static String getReferenceName(String reference) {
 		String head = getReferenceHead(reference);
 		String tail = getReferenceTail(reference);
-		if (tail.equals("")) {
+		if (tail.isEmpty()) {
 			return head;
 		} 
 		return getReferenceName(tail);
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/references/HierarchicalUniqueNameReferenceManager.java'
--- WorkcraftCore/src/org/workcraft/dom/references/HierarchicalUniqueNameReferenceManager.java	2015-05-14 18:00:15 +0000
+++ WorkcraftCore/src/org/workcraft/dom/references/HierarchicalUniqueNameReferenceManager.java	2015-06-26 22:23:53 +0000
@@ -136,7 +136,7 @@
 		if (provider==null) {
 			provider = topProvider;
 		}
-		if (reference.equals("") || reference.equals(NamespaceHelper.hierarchySeparator)) { 
+		if (reference.isEmpty() || reference.equals(NamespaceHelper.hierarchySeparator)) { 
 			return provider;
 		}
 		String head =  NamespaceHelper.getReferenceHead(reference);
@@ -163,7 +163,7 @@
 		do {
 			component = getNamespaceProvider(node);
 			if (component != null) {
-				if (!result.equals("")) {
+				if (!result.isEmpty()) {
 					result = NamespaceHelper.hierarchySeparator + result;
 				}
 				String name = getNameManager(component).getName(node);
 
=== added file 'WorkcraftCore/src/org/workcraft/dom/visual/FontHelper.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/FontHelper.java	1970-01-01 00:00:00 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/FontHelper.java	2015-06-26 22:23:53 +0000
@@ -0,0 +1,13 @@
+package org.workcraft.dom.visual;
+
+import java.awt.Font;
+import java.awt.Toolkit;
+
+public class FontHelper {
+
+	public static int getFontSizeInPixels(Font font) {
+		int screenDpi = Toolkit.getDefaultToolkit().getScreenResolution();
+		return (int)Math.round(font.getSize2D() * screenDpi / 72.0);
+	}
+	
+}
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualComponent.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualComponent.java	2015-02-27 18:31:36 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualComponent.java	2015-06-26 22:23:53 +0000
@@ -43,6 +43,14 @@
 import org.workcraft.plugins.shared.CommonVisualSettings;
 
 public abstract class VisualComponent extends VisualTransformableNode implements Drawable, DependentNode {
+	public static final String PROPERTY_LABEL = "Label";
+	public static final String PROPERTY_LABEL_POSITIONING = "Label positioning";
+	public static final String PROPERTY_LABEL_COLOR = "Label color";
+	public static final String PROPERTY_NAME_POSITIONING = "Name positioning";
+	public static final String PROPERTY_NAME_COLOR = "Name color";
+	public static final String PROPERTY_FOREGROUND_COLOR = "Foreground color";
+	public static final String PROPERTY_FILL_COLOR = "Fill color";
+	
 	public static final Font labelFont = new Font("Sans-serif", Font.PLAIN, 1).deriveFont(0.5f);
 	public static final Font nameFont = new Font("Sans-serif", Font.ITALIC, 1).deriveFont(0.5f);
 
@@ -90,7 +98,7 @@
 	
 	private void addColorPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualComponent, Color>(
-				this, "Foreground color", Color.class) {
+				this, PROPERTY_FOREGROUND_COLOR, Color.class) {
 			protected void setter(VisualComponent object, Color value) {
 				object.setForegroundColor(value);
 			}
@@ -100,7 +108,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualComponent, Color>(
-				this, "Fill color", Color.class) {
+				this, PROPERTY_FILL_COLOR, Color.class) {
 			protected void setter(VisualComponent object, Color value) {
 				object.setFillColor(value);
 			}
@@ -112,7 +120,7 @@
 
 	private void addLabelPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualComponent, String>(
-				this, "Label", String.class) {
+				this, PROPERTY_LABEL, String.class) {
 			protected void setter(VisualComponent object, String value) {
 				object.setLabel(value);
 			}
@@ -122,7 +130,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualComponent, Positioning>(
-				this, "Label positioning", Positioning.class) {
+				this, PROPERTY_LABEL_POSITIONING, Positioning.class) {
 			protected void setter(VisualComponent object, Positioning value) {
 				object.setLabelPositioning(value);
 			}
@@ -132,7 +140,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualComponent, Color>(
-				this, "Label color", Color.class) {
+				this, PROPERTY_LABEL_COLOR, Color.class) {
 			protected void setter(VisualComponent object, Color value) {
 				object.setLabelColor(value);
 			}
@@ -144,7 +152,7 @@
 
 	private void addNamePropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualComponent, Positioning>(
-				this, "Name positioning", Positioning.class) {
+				this, PROPERTY_NAME_POSITIONING, Positioning.class) {
 			protected void setter(VisualComponent object, Positioning value) {
 				object.setNamePositioning(value);
 			}
@@ -154,7 +162,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualComponent, Color>(
-				this, "Name color", Color.class) {
+				this, PROPERTY_NAME_COLOR, Color.class) {
 			protected void setter(VisualComponent object, Color value) {
 				object.setNameColor(value);
 			}
@@ -170,7 +178,7 @@
 
 	public void setLabel(String label) {
 		this.label = label;
-		sendNotification(new PropertyChangedEvent(this, "label"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_LABEL));
 	}
 
 	public Positioning getLabelPositioning() {
@@ -179,7 +187,7 @@
 
 	public void setLabelPositioning(Positioning value) {
 		labelPositioning = value;
-		sendNotification(new PropertyChangedEvent(this, "label positioning"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_LABEL_POSITIONING));
 	}
 
 	public Color getLabelColor() {
@@ -188,7 +196,7 @@
 
 	public void setLabelColor(Color value) {
 		labelColor = value;
-		sendNotification(new PropertyChangedEvent(this, "label color"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_LABEL_COLOR));
 	}
 
 	public Positioning getNamePositioning() {
@@ -197,7 +205,7 @@
 
 	public void setNamePositioning(Positioning value) {
 		namePositioning = value;
-		sendNotification(new PropertyChangedEvent(this, "reference positioning"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_NAME_POSITIONING));
 	}
 
 	public Color getNameColor() {
@@ -206,7 +214,7 @@
 
 	public void setNameColor(Color value) {
 		nameColor = value;
-		sendNotification(new PropertyChangedEvent(this, "reference color"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_NAME_COLOR));
 	}
 	
 	public Color getForegroundColor() {
@@ -215,7 +223,7 @@
 
 	public void setForegroundColor(Color value) {
 		foregroundColor = value;
-		sendNotification(new PropertyChangedEvent(this, "foreground color"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_FOREGROUND_COLOR));
 	}
 
 	public Color getFillColor() {
@@ -224,7 +232,7 @@
 
 	public void setFillColor(Color value) {
 		fillColor = value;
-		sendNotification(new PropertyChangedEvent(this, "fill color"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_FILL_COLOR));
 	}
 
 	public MathNode getReferencedComponent() {
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualGroup.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualGroup.java	2015-06-03 16:22:58 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualGroup.java	2015-06-26 22:23:53 +0000
@@ -48,9 +48,7 @@
 
 
 public class VisualGroup extends VisualTransformableNode implements Drawable, Collapsible, Container, ObservableHierarchy {
-	public static final int HIT_COMPONENT = 1;
-	public static final int HIT_CONNECTION = 2;
-	public static final int HIT_GROUP = 3;
+	public static final String PROPERTY_IS_COLLAPSED = "Is collapsed";
 
 	protected double size = CommonVisualSettings.getBaseSize();
 	protected final double margin = 0.20;
@@ -67,7 +65,7 @@
 	
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualGroup, Boolean>(
-				this, "Is collapsed", Boolean.class) {
+				this, PROPERTY_IS_COLLAPSED, Boolean.class) {
 			
 			@Override
 			protected void setter(VisualGroup object, Boolean value) {
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/VisualPage.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/VisualPage.java	2015-05-22 17:42:39 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/VisualPage.java	2015-06-26 22:23:53 +0000
@@ -30,6 +30,9 @@
 @DisplayName("Page")
 @SVGIcon("images/icons/svg/selection-page.svg")
 public class VisualPage extends VisualComponent implements Drawable, Collapsible, Container, ObservableHierarchy {
+	public static final String PROPERTY_IS_COLLAPSED = "Is collapsed";
+	public static final String PROPERTY_REFERENCED_MODEL = "Referenced model";
+	
 	private boolean isCurrentLevelInside = false;
 	private boolean isCollapsed = false;
 	private boolean isExcited = false;
@@ -56,7 +59,7 @@
 	
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualPage, Boolean>(
-				this, "Is collapsed", Boolean.class) {
+				this, PROPERTY_IS_COLLAPSED, Boolean.class) {
 			
 			@Override
 			protected void setter(VisualPage object, Boolean value) {
@@ -69,7 +72,7 @@
 		});
 		
 		addPropertyDeclaration(new PropertyDeclaration<VisualPage, String>(
-				this, "Referenced model", String.class) {
+				this, PROPERTY_REFERENCED_MODEL, String.class) {
 			
 			@Override
 			protected void setter(VisualPage object, String value) {
 
=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java'
--- WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java	2015-04-13 18:41:37 +0000
+++ WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java	2015-06-26 22:23:53 +0000
@@ -61,6 +61,13 @@
 public class VisualConnection extends VisualNode implements Node, Drawable, Shapable, DependentNode,
 		Connection, VisualConnectionProperties, ObservableHierarchy {
 
+	public static final String PROPERTY_CONNECTION_TYPE = "Connection type";
+	public static final String PROPERTY_COLOR = "Color";
+	public static final String PROPERTY_LINE_WIDTH = "Line width";
+	public static final String PROPERTY_ARROW_LENGTH = "Arrow length";
+	public static final String PROPERTY_ARROW_WIDTH = "Arrow width";
+	public static final String PROPERTY_SCALE_MODE = "Scale mode";
+
 	public enum ConnectionType {
 		POLYLINE("Polyline"),
 		BEZIER("Bezier");
@@ -151,7 +158,7 @@
 
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualConnection, Double>(
-				this, "Line width", Double.class, true, true, true) {
+				this, PROPERTY_LINE_WIDTH, Double.class, true, true, true) {
 			@Override
 			public void setter(VisualConnection object, Double value) {
 				object.setLineWidth(value);
@@ -163,7 +170,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualConnection, Double>(
-				this, "Arrow width", Double.class, true, true, true) {
+				this, PROPERTY_ARROW_WIDTH, Double.class, true, true, true) {
 			@Override
 			public void setter(VisualConnection object, Double value) {
 				object.setArrowWidth(value);
@@ -175,7 +182,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualConnection, Double>(
-				this, "Arrow length", Double.class, true, true, true) {
+				this, PROPERTY_ARROW_LENGTH, Double.class, true, true, true) {
 			@Override
 			public void setter(VisualConnection object, Double value) {
 				object.setArrowLength(value);
@@ -196,7 +203,7 @@
 		});
 		
 		addPropertyDeclaration(new PropertyDeclaration<VisualConnection, ConnectionType>(
-				this, "Connection type", ConnectionType.class, true, true, false) {
+				this, PROPERTY_CONNECTION_TYPE, ConnectionType.class, true, true, false) {
 			protected void setter(VisualConnection object, ConnectionType value) {
 				object.setConnectionType(value);
 				for (ControlPoint cp: object.getGraphic().getControlPoints()) {
@@ -211,7 +218,7 @@
 		});
 
 		addPropertyDeclaration(new PropertyDeclaration<VisualConnection, ScaleMode>(
-				this, "Scale mode", ScaleMode.class, true, true, true) {
+				this, PROPERTY_SCALE_MODE, ScaleMode.class, true, true, true) {
 			protected void setter(VisualConnection object, ScaleMode value) {
 				object.setScaleMode(value);
 			}
@@ -221,7 +228,7 @@
 		});
 		
 		addPropertyDeclaration(new PropertyDeclaration<VisualConnection, Color>(
-				this, "Color", Color.class, true, true, true) {
+				this, PROPERTY_COLOR, Color.class, true, true, true) {
 			protected void setter(VisualConnection object, Color value) {
 				object.setColor(value);
 			}
@@ -296,9 +303,9 @@
 			children.add(graphic);
 			observableHierarchyImpl.sendNotification(new NodesAddedEvent(this,	getGraphic()));
 			graphic.invalidate();
-			observableStateImpl.sendNotification(new PropertyChangedEvent(this, "connectionType"));
+			observableStateImpl.sendNotification(new PropertyChangedEvent(this, PROPERTY_CONNECTION_TYPE));
 		}
-		sendNotification(new PropertyChangedEvent(this, "connection type"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_CONNECTION_TYPE));
 	}
 	
 	public Color getColor() {
@@ -307,7 +314,7 @@
 	
 	public void setColor(Color color) {
 		this.color = color;
-		sendNotification(new PropertyChangedEvent(this, "color"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_COLOR));
 	}
 	
 	@Override
@@ -327,7 +334,7 @@
 		this.lineWidth = lineWidth;
 		
 		invalidate();
-		sendNotification(new PropertyChangedEvent(this, "line width"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_LINE_WIDTH));
 	}
 
 	@Override
@@ -354,7 +361,7 @@
 		if (value < 0.0) value = 0.0;
 		this.arrowWidth = value;
 		invalidate();
-		sendNotification(new PropertyChangedEvent(this, "arrow width"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_ARROW_WIDTH));
 
 	}
 
@@ -369,7 +376,7 @@
 		if (value < 0.0) value = 0.0;
 		this.arrowLength = value;
 		invalidate();
-		sendNotification(new PropertyChangedEvent(this, "arrow length"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_ARROW_LENGTH));
 	}
 
 	public void invalidate() {
@@ -518,7 +525,7 @@
 	
 	public void setScaleMode(ScaleMode scaleMode) {
 		this.scaleMode = scaleMode;
-		sendNotification(new PropertyChangedEvent(this, "scale mode"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_SCALE_MODE));
 	}
 	
 	@Override
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/DockableWindow.java'
--- WorkcraftCore/src/org/workcraft/gui/DockableWindow.java	2014-09-05 14:09:00 +0000
+++ WorkcraftCore/src/org/workcraft/gui/DockableWindow.java	2015-06-26 22:23:53 +0000
@@ -134,8 +134,9 @@
 		for (Object d : port.getDockables()) {
 			DockableWindow dockable = (DockableWindow)d;
 			boolean inTab = dockable.getComponent().getParent() instanceof JTabbedPane;
+			DockableWindowContentPanel contentPanel = dockable.getContentPanel();
 			if (inTab && !dockable.isMaximized()) {
-				dockable.getContentPanel().setHeaderVisible(false);
+				contentPanel.setHeaderVisible(false);
 				JTabbedPane tabbedPane = (JTabbedPane)dockable.getComponent().getParent();
 				for (int i=0; i<tabbedPane.getComponentCount(); i++) {
 					if (dockable.getComponent() == tabbedPane.getComponentAt(i)) {
@@ -144,17 +145,24 @@
 					}
 				}
 			} else {
-				dockable.getContentPanel().setHeaderVisible(true);
+				contentPanel.setHeaderVisible(true);
 			}
 		}
 	}
 	
+	public void setTitle(String title) {
+		if ( !getTitle().equals(title) ) {
+			getContentPanel().setTitle(title);
+			setTabText(title);
+		}
+	}
+	
 	public String getTitle() {
-		return panel.getTitle();
+		return getContentPanel().getTitle();
 	}
 
 	public int getID() {
-		return panel.getID();
+		return getContentPanel().getID();
 	}
 	
 	private static void processTabEvents(DockingPort port) {
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/DockableWindowContentPanel.java'
--- WorkcraftCore/src/org/workcraft/gui/DockableWindowContentPanel.java	2014-12-12 18:43:40 +0000
+++ WorkcraftCore/src/org/workcraft/gui/DockableWindowContentPanel.java	2015-06-26 22:23:53 +0000
@@ -33,6 +33,7 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
+import javax.swing.border.Border;
 
 import org.workcraft.Framework;
 import org.workcraft.exceptions.NotSupportedException;
@@ -83,6 +84,7 @@
 	}
 
 	class DockableViewHeader extends JPanel {
+		private final Border BORDER_TITLE = BorderFactory.createEmptyBorder(1, 3, 1, 1);
 		private ActionButton btnMin, btnMax, btnClose;
 		private JLabel titleLabel = null;
 		private JPanel buttonPanel = null;
@@ -148,10 +150,11 @@
 				buttonPanel.setPreferredSize(new Dimension((UIManager.getIcon("InternalFrame.closeIcon").getIconWidth()+4) * icons,UIManager.getIcon("InternalFrame.closeIcon").getIconHeight()+4));
 			}
 
-			titleLabel = new JLabel(" "+ title);
+			titleLabel = new JLabel(title);
 			titleLabel.setOpaque(false);
 			titleLabel.setForeground(UIManager.getColor("InternalFrame.activeTitleForeground"));
 			titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD));
+			titleLabel.setBorder(BORDER_TITLE);
 			add(titleLabel, BorderLayout.WEST);
 
 			setMaximized(false);
@@ -177,6 +180,7 @@
 		
 		public void setTitle(String title) {
 			titleLabel.setText(title);
+			titleLabel.repaint();
 		}
 	}
 
 
=== renamed file 'WorkcraftCore/src/org/workcraft/gui/LAF.java' => 'WorkcraftCore/src/org/workcraft/gui/LookAndFeelHelper.java'
--- WorkcraftCore/src/org/workcraft/gui/LAF.java	2009-09-22 21:01:45 +0000
+++ WorkcraftCore/src/org/workcraft/gui/LookAndFeelHelper.java	2015-06-26 22:23:53 +0000
@@ -21,23 +21,40 @@
 
 package org.workcraft.gui;
 
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-
-import org.jvnet.substance.SubstanceLookAndFeel;
-import org.jvnet.substance.api.SubstanceConstants.TabContentPaneBorderKind;
-
-
-public class LAF {
-	public static String currentLAF = UIManager.getLookAndFeel().getClass().getName();
-
-	public static String getCurrentLAF() {
-		return currentLAF;
-	}
-
-	public static void setLAF(String LAF) {
-		try {
-			UIManager.setLookAndFeel(LAF);
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+import org.jvnet.substance.SubstanceLookAndFeel;
+import org.jvnet.substance.api.SubstanceConstants.TabContentPaneBorderKind;
+
+public class LookAndFeelHelper {
+	
+	private static Map<String, String> lafMap;
+	
+	public static Map<String, String> getLafMap() {
+		if (lafMap == null) {
+			lafMap = new LinkedHashMap<>();
+			lafMap.put("Metal (default)", "javax.swing.plaf.metal.MetalLookAndFeel");
+			lafMap.put("Windows", "com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+			lafMap.put("Substance: Moderate", "org.jvnet.substance.skin.SubstanceModerateLookAndFeel");
+			lafMap.put("Substance: Mist Silver", "org.jvnet.substance.skin.SubstanceMistSilverLookAndFeel");
+			lafMap.put("Substance: Raven", "org.jvnet.substance.skin.SubstanceRavenLookAndFeel");
+			lafMap.put("Substance: Business", "org.jvnet.substance.skin.SubstanceBusinessLookAndFeel");
+			lafMap.put("Substance: Creme", "org.jvnet.substance.skin.SubstanceCremeCoffeeLookAndFeel");
+		}
+		return Collections.unmodifiableMap(lafMap); 
+	}
+
+	public static void setLookAndFeel(String laf) {
+		if (laf == null) {
+			laf = UIManager.getSystemLookAndFeelClassName();
+		}
+		try {
+			UIManager.setLookAndFeel(laf);
 		} catch (ClassNotFoundException e) {
 			e.printStackTrace();
 		} catch (InstantiationException e) {
@@ -47,16 +64,10 @@
 		} catch (UnsupportedLookAndFeelException e) {
 			e.printStackTrace();
 		}
-
-		currentLAF = LAF;
-	}
-
-	public static void setDefaultLAF() {
-		setLAF(UIManager.getCrossPlatformLookAndFeelClassName());
-	}
-
-	public static void setSubstanceLAF(String LAF) {
-		setLAF(LAF);
+	}
+
+	public static void setSubstance(String laf) {
+		setLookAndFeel(laf);
 		UIManager.put(SubstanceLookAndFeel.TABBED_PANE_CONTENT_BORDER_KIND, TabContentPaneBorderKind.SINGLE_FULL);
 	}
 }
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/MainMenu.java'
--- WorkcraftCore/src/org/workcraft/gui/MainMenu.java	2015-02-11 10:58:21 +0000
+++ WorkcraftCore/src/org/workcraft/gui/MainMenu.java	2015-06-26 22:23:53 +0000
@@ -29,6 +29,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 
 import javax.swing.JLabel;
@@ -119,34 +120,15 @@
 	final private JMenu mnExport = new JMenu("Export");
 	final private JMenu mnRecent = new JMenu("Open recent");
 	final private JMenu mnWindows = new JMenu("Windows");
-	final private JMenu mnTools = new JMenu("Tools");
-	final private HashMap <Integer, ActionCheckBoxMenuItem> windowItems = new HashMap<Integer, ActionCheckBoxMenuItem>();
+	final private HashMap <Integer, ActionCheckBoxMenuItem> windowItems = new HashMap<Integer, ActionCheckBoxMenuItem>();
+	final private LinkedList<JMenu> mnToolsList = new LinkedList<>();
+	final private JMenu mnHelp = new JMenu("Help");
 	
-	private String[] lafCaptions = new String[] {
-			"Java default",
-			"Windows",
-			"Substance: Moderate",
-			"Substance: Mist Silver",
-			"Substance: Raven",
-			"Substance: Business",
-			"Substance: Creme"
-	};
-	private String[] lafClasses = new String[] {
-			"javax.swing.plaf.metal.MetalLookAndFeel",
-			"com.sun.java.swing.plaf.windows.WindowsLookAndFeel",
-			"org.jvnet.substance.skin.SubstanceModerateLookAndFeel",
-			"org.jvnet.substance.skin.SubstanceMistSilverLookAndFeel",
-			"org.jvnet.substance.skin.SubstanceRavenLookAndFeel",
-			"org.jvnet.substance.skin.SubstanceBusinessLookAndFeel",
-			"org.jvnet.substance.skin.SubstanceCremeCoffeeLookAndFeel"
-	};
-
 	MainMenu(final MainWindow mainWindow) {
 		this.mainWindow = mainWindow;
 		addFileMenu(mainWindow);
 		addEditMenu(mainWindow);
 		addViewMenu(mainWindow);
-		add(mnTools);
 		addHelpMenu(mainWindow);
 	}
 
@@ -225,7 +207,7 @@
 		mnFile.add(miImport);
 		mnFile.add(mnExport);
 		
-		// FIXME: Workspace functionality is not working yet.
+// FIXME: Workspace functionality is not working yet.
 //		mnFile.addSeparator();
 //		mnFile.add(miNewWorkspace);
 //		mnFile.add(miOpenWorkspace);
@@ -362,29 +344,28 @@
 		miPanCenter.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_T, ActionEvent.CTRL_MASK));
 		miPanCenter.addScriptedActionListener(mainWindow.getDefaultActionListener());
 
-		JMenu mnLAF = new JMenu("Look and Feel");
-		for (int i = 0; i < lafClasses.length; i++) {
-			JMenuItem miLAFItem = new JMenuItem();
-			miLAFItem.setText(lafCaptions[i]);
-			final String lafClass = lafClasses[i];
-			miLAFItem.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					try {
-						mainWindow.setLAF(lafClass);
-					} catch (OperationCancelledException e1) {
-					}
-				}
-			});
-			mnLAF.add(miLAFItem);
-		}
-
-		/*	ScriptedActionMenuItem miSaveLayout = new ScriptedActionMenuItem(MainWindow.Actions.SAVE_UI_LAYOUT);
-		miSaveLayout.addScriptedActionListener(mainWindow.getDefaultActionListener());		
-		mnView.add(miSaveLayout);
-
-		ScriptedActionMenuItem miLoadLayout = new ScriptedActionMenuItem(MainWindow.Actions.LOAD_UI_LAYOUT);
-		miLoadLayout.addScriptedActionListener(mainWindow.getDefaultActionListener());		
-		mnView.add(miLoadLayout);*/
+// FIXME: Only the default Look and Feel works good, the others cause some problems.		
+//		JMenu mnLookAndFeel = new JMenu("Look and Feel");
+//		for (final Entry<String, String> laf: LookAndFeelHelper.getLafMap().entrySet()) {
+//			JMenuItem miLAFItem = new JMenuItem();
+//			miLAFItem.setText(laf.getKey());
+//			miLAFItem.addActionListener(new ActionListener() {
+//				public void actionPerformed(ActionEvent e) {
+//					try {
+//						mainWindow.setLookAndFeel(laf.getValue());
+//					} catch (OperationCancelledException e1) {
+//					}
+//				}
+//			});
+//			mnLookAndFeel.add(miLAFItem);
+//		}
+		
+// FIXME: Save-load of the layout is not functional yet.
+//  	ScriptedActionMenuItem miSaveLayout = new ScriptedActionMenuItem(MainWindow.Actions.SAVE_UI_LAYOUT);
+//		miSaveLayout.addScriptedActionListener(mainWindow.getDefaultActionListener());		
+//
+//		ScriptedActionMenuItem miLoadLayout = new ScriptedActionMenuItem(MainWindow.Actions.LOAD_UI_LAYOUT);
+//		miLoadLayout.addScriptedActionListener(mainWindow.getDefaultActionListener());		
 
 		ActionMenuItem miResetLayout = new ActionMenuItem(MainWindowActions.RESET_GUI_ACTION);
 		miResetLayout.addScriptedActionListener(mainWindow.getDefaultActionListener());
@@ -401,15 +382,17 @@
 		mnView.add(miPanDown);
 		mnView.addSeparator();
 		mnView.add(mnWindows);
-		mnView.add(mnLAF);
+//		mnView.add(mnLookAndFeel);
+//		mnView.addSeparator();
 		mnView.add(miResetLayout);
-		
+//		mnView.add(miSaveLayout);
+//		mnView.add(miLoadLayout);
 		
 		add(mnView);
 	}
 
 	private void addHelpMenu(final MainWindow mainWindow) {
-		JMenu mnHelp = new JMenu();
+		//JMenu mnHelp = new JMenu();
 		mnHelp.setText("Help");
 
 		ActionMenuItem miOverview = new ActionMenuItem(MainWindowActions.HELP_OVERVIEW_ACTION);
@@ -439,16 +422,11 @@
 		mnHelp.add(miQuestion);
 		mnHelp.addSeparator();
 		mnHelp.add(miAbout);
-		
+
+		//add(Box.createHorizontalGlue());
 		add(mnHelp);
 	}
 
-	final public void setMenuForWorkspaceEntry(final WorkspaceEntry we) {
-		we.updateActionState();
-		setToolsMenu(we);
-		setExportMenu(we);
-	}
-
 	private void setExportMenu(final WorkspaceEntry we) {
 		mnExport.removeAll();
 		mnExport.setEnabled(false);
@@ -481,36 +459,19 @@
 				haveNonVisual = true;
 			}
 		}
-	}
-
-	private void setToolsMenu(final WorkspaceEntry we) {
-		mnTools.setVisible(true);
-		mnTools.removeAll();
-
-		ListMap<String, Pair<String, Tool>> tools = Tools.getTools(we);
-		List<String> sections = Tools.getSections(tools);
-
-		for (String section : sections) {
-			JMenu target = mnTools;
-			if (!section.isEmpty()) {
-				JMenu sectionMenu = new JMenu (section);
-				mnTools.add(sectionMenu);
-				target = sectionMenu;
-			}
-			for (Pair<String, Tool> tool : Tools.getSectionTools(section, tools)) {
-				ActionMenuItem miTool = new ActionMenuItem(new ToolAction(tool));
-				miTool.addScriptedActionListener(mainWindow.getDefaultActionListener());
-				target.add(miTool);
-			}
-		}
-	}
-
-	final public void registerUtilityWindow(DockableWindow window) {
-		ActionCheckBoxMenuItem miWindowItem = new ActionCheckBoxMenuItem(new ToggleWindowAction(window));
-		miWindowItem.addScriptedActionListener(mainWindow.getDefaultActionListener());
-		miWindowItem.setSelected(!window.isClosed());
-		windowItems.put (window.getID(), miWindowItem);
-		mnWindows.add(miWindowItem);
+		revalidate();
+	}
+	
+	public void setExportMenuState(boolean enable) {
+		mnExport.setEnabled(enable);
+	}
+
+	final public void registerUtilityWindow(DockableWindow window) {
+		ActionCheckBoxMenuItem miWindowItem = new ActionCheckBoxMenuItem(new ToggleWindowAction(window));
+		miWindowItem.addScriptedActionListener(mainWindow.getDefaultActionListener());
+		miWindowItem.setSelected(!window.isClosed());
+		windowItems.put(window.getID(), miWindowItem);
+		mnWindows.add(miWindowItem);
 	}
 	
 	final public void setRecentMenu(ArrayList<String> entries) {
@@ -547,35 +508,76 @@
 			}
 		});
 		mnRecent.add(miClear);
-	}
-
-	final public void utilityWindowClosed (int ID) {
-		ActionCheckBoxMenuItem mi = windowItems.get(ID);
-		if (mi!=null)
-			mi.setSelected(false);
-	}
-
-	final public void utilityWindowDisplayed (int ID) {
-		ActionCheckBoxMenuItem mi = windowItems.get(ID);
-		if (mi!=null)
-			mi.setSelected(true);
-	}
-
-	public void reset() {
-		mnTools.setVisible(false);
-		mnTools.removeAll();
-	}
-	
-	public JMenu getRecentMenu() {
-		return mnRecent;
-	}
-	
-	public JMenu getExportMenu() {
-		return mnExport;
-	}
-	
-	public JMenu getToolsMenu() {
-		return mnTools;
+	}
+
+	final public void utilityWindowClosed (int ID) {
+		ActionCheckBoxMenuItem mi = windowItems.get(ID);
+		if (mi!=null)
+			mi.setSelected(false);
+	}
+
+	final public void utilityWindowDisplayed (int ID) {
+		ActionCheckBoxMenuItem mi = windowItems.get(ID);
+		if (mi!=null)
+			mi.setSelected(true);
+	}
+
+	private void createToolsMenu(final WorkspaceEntry we) {
+		removeToolsMenu();
+
+		ListMap<String, Pair<String, Tool>> tools = Tools.getTools(we);
+		List<String> sections = Tools.getSections(tools);
+
+		JMenu mnTools = new JMenu("Tools");
+		mnToolsList.clear();
+		for (String section : sections) {
+			JMenu mnSection = mnTools;
+			if (!section.isEmpty()) {
+				mnSection = new JMenu(section);
+				boolean promote = section.startsWith("!");
+				if (promote) {
+					mnSection.setText(section.substring(1));
+					mnToolsList.add(mnSection);
+				} else {
+					mnTools.add(mnSection);
+					mnToolsList.addFirst(mnTools);
+				}
+			}
+			for (Pair<String, Tool> tool : Tools.getSectionTools(section, tools)) {
+				ActionMenuItem miTool = new ActionMenuItem(new ToolAction(tool));
+				miTool.addScriptedActionListener(mainWindow.getDefaultActionListener());
+				mnSection.add(miTool);
+			}
+		}
+		addToolsMenu();
+	}
+	
+	private void addToolsMenu() {
+		for (JMenu mnTools: mnToolsList) {
+			add(mnTools);
+		}
+		remove(mnHelp);
+		add(mnHelp);
+		revalidate();
+	}
+
+	public void removeToolsMenu() {
+		for (JMenu mnTools: mnToolsList) {
+			remove(mnTools);
+		}
+		revalidate();
+	}
+	
+	public void updateToolsMenuState(boolean enable) {
+		for (JMenu mnTool: mnToolsList) {
+			mnTool.setEnabled(enable);
+		}
+	}
+
+	public void setMenuForWorkspaceEntry(final WorkspaceEntry we) {
+		we.updateActionState();
+		createToolsMenu(we);
+		setExportMenu(we);
 	}
 
 }
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/MainWindow.java'
--- WorkcraftCore/src/org/workcraft/gui/MainWindow.java	2015-04-28 11:37:35 +0000
+++ WorkcraftCore/src/org/workcraft/gui/MainWindow.java	2015-06-26 22:23:53 +0000
@@ -114,6 +114,16 @@
 
 @SuppressWarnings("serial")
 public class MainWindow extends JFrame {
+	public static final String TITLE_OUTPUT = "Output";
+	public static final String TITLE_PROBLEMS = "Problems";
+	public static final String TITLE_JAVASCRIPT = "Javascript";
+	public static final String TITLE_TASKS = "Tasks";
+	public static final String TITLE_WORKSPACE = "Workspace";
+	public static final String TITLE_PROPERTY_EDITOR = "Property editor";
+	public static final String TITLE_TOOL_CONTROLS = "Tool controls";
+	public static final String TITLE_EDITOR_TOOLS = "Editor tools";
+	public static final String TITLE_PLACEHOLDER = "";
+
 	private static final String UILAYOUT_PATH = "./config/uilayout.xml";
 	private static final int VIEWPORT_MARGIN = 30;
 
@@ -182,14 +192,13 @@
 		});
 	}
 
-	public void setLAF(String laf) throws OperationCancelledException {
-		if (JOptionPane.showConfirmDialog(this,
+	public void setLookAndFeel(String laf) throws OperationCancelledException {
+		int dialogResult = JOptionPane.showConfirmDialog(this,
 				"Changing Look and Feel requires GUI restart.\n\n"
 				+ "This will cause the visual editor windows to be closed.\n\nProceed?",
-				"Confirm", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
-			if (laf == null)
-				laf = UIManager.getSystemLookAndFeelClassName();
+				"Confirm", JOptionPane.YES_NO_OPTION);
 
+		if (dialogResult == JOptionPane.YES_OPTION) {
 			final Framework framework = Framework.getInstance();
 			framework.setConfigVar("gui.lookandfeel", laf);
 			framework.restartGUI();
@@ -201,9 +210,9 @@
 	}
 
 	private DockableWindow createDockableWindow(JComponent component,
-			String name, Dockable neighbour, int options) {
-		return createDockableWindow(component, name, neighbour, options,
-				DockingConstants.CENTER_REGION, name);
+			String title, Dockable neighbour, int options) {
+		return createDockableWindow(component, title, neighbour, options,
+				DockingConstants.CENTER_REGION, title);
 	}
 
 	private DockableWindow createDockableWindow(JComponent component,
@@ -374,10 +383,8 @@
 
 		final Framework framework = Framework.getInstance();
 		String laf = framework.getConfigVar("gui.lookandfeel");
-		if (laf == null) {
-			laf = UIManager.getCrossPlatformLookAndFeelClassName();
-		}
-		LAF.setLAF(laf);
+		SilverOceanTheme.enable();
+		LookAndFeelHelper.setLookAndFeel(laf);
 		SwingUtilities.updateComponentTreeUI(this);
 
 		content = new JPanel(new BorderLayout(0, 0));
@@ -426,49 +433,49 @@
 		float xSplit = 0.88f;
 		float ySplit = 0.82f;
 		outputDockable = createDockableWindow(
-				outputWindow, "Output",
+				outputWindow, TITLE_OUTPUT,
 				DockableWindowContentPanel.CLOSE_BUTTON,
 				DockingManager.SOUTH_REGION, ySplit);
 		
 		erroDockable = createDockableWindow(
-				errorWindow, "Problems", outputDockable, 
+				errorWindow, TITLE_PROBLEMS, outputDockable, 
 				DockableWindowContentPanel.CLOSE_BUTTON);
 		
 		javaScriptDockable = createDockableWindow(
-				javaScriptWindow, "Javascript",	outputDockable,	
+				javaScriptWindow, TITLE_JAVASCRIPT,	outputDockable,	
+				DockableWindowContentPanel.CLOSE_BUTTON);
+		
+		tasksDockable = createDockableWindow(
+				new TaskManagerWindow(), TITLE_TASKS, outputDockable,
 				DockableWindowContentPanel.CLOSE_BUTTON);
 
 		workspaceDockable = createDockableWindow(
-				workspaceWindow, "Workspace", 
+				workspaceWindow, TITLE_WORKSPACE, 
 				DockableWindowContentPanel.CLOSE_BUTTON,
 				DockingManager.EAST_REGION, xSplit);
 
 		propertyEditorDockable = createDockableWindow(
-				propertyEditorWindow, "Property editor", workspaceDockable,
+				propertyEditorWindow, TITLE_PROPERTY_EDITOR, workspaceDockable,
 				DockableWindowContentPanel.CLOSE_BUTTON,
 				DockingManager.NORTH_REGION, ySplit);
 		
 		toolControlsDockable = createDockableWindow(
-				editorToolsWindow, "Tool controls", propertyEditorDockable,
+				editorToolsWindow, TITLE_TOOL_CONTROLS, propertyEditorDockable,
 				DockableWindowContentPanel.CLOSE_BUTTON,
 				DockingManager.SOUTH_REGION, 0.4f);
 
 		editorToolsDockable = createDockableWindow(
-				toolControlsWindow, "Editor tools", toolControlsDockable,
+				toolControlsWindow, TITLE_EDITOR_TOOLS, toolControlsDockable,
 				DockableWindowContentPanel.HEADER | DockableWindowContentPanel.CLOSE_BUTTON,
 				DockingManager.SOUTH_REGION, 0.82f);
 
 		documentPlaceholder = createDockableWindow(
-				new DocumentPlaceholder(), "", null, outputDockable, 
+				new DocumentPlaceholder(), TITLE_PLACEHOLDER, null, outputDockable, 
 				0, DockingManager.NORTH_REGION, ySplit, "DocumentPlaceholder");
 
 		DockingManager.display(outputDockable);
 		EffectsManager.setPreview(new AlphaPreview(Color.BLACK, Color.GRAY,	0.5f));
 
-		tasksDockable = createDockableWindow(
-				new TaskManagerWindow(), "Tasks", outputDockable,
-				DockableWindowContentPanel.CLOSE_BUTTON);
-
 		setVisible(true);
 		loadDockingLayout();
 
@@ -492,7 +499,7 @@
 				// createGlyphVector is called for the first time
 				Font font = new Font("Sans-serif", Font.PLAIN, 1);
 				font.createGlyphVector(new FontRenderContext(
-						new AffineTransform(), true, true), "");
+						new AffineTransform(), true, true), TITLE_PLACEHOLDER);
 
 				// force svg rendering classes to load
 				GUI.createIconFromSVG("images/icons/svg/place.svg");
@@ -503,7 +510,7 @@
 	}
 
 	private void setWorkActionsEnableness(boolean enable) {
-		getMainMenu().getExportMenu().setEnabled(enable);
+		getMainMenu().setExportMenuState(enable);
 		MainWindowActions.MERGE_WORK_ACTION.setEnabled(enable);
 		MainWindowActions.CLOSE_ACTIVE_EDITOR_ACTION.setEnabled(enable);
 		MainWindowActions.CLOSE_ALL_EDITORS_ACTION.setEnabled(enable);
@@ -588,8 +595,9 @@
 
 			if (editorInFocus == editor) {
 				toolControlsWindow.setContent(null);
-				mainMenu.reset();
+				mainMenu.removeToolsMenu();
 				editorInFocus = null;
+				setDockableTitle(getPropertyEditor(), TITLE_PROPERTY_EDITOR);
 			}
 
 			editorWindows.remove(we, dockableWindow);
@@ -841,11 +849,7 @@
 
 			toolControlsWindow.setContent(sender.getToolBox());
 			editorToolsWindow.setContent(sender.getToolBox().getControlPanel());
-
 			mainMenu.setMenuForWorkspaceEntry(editorInFocus.getWorkspaceEntry());
-
-			mainMenu.revalidate();
-			mainMenu.repaint();
 			sender.updatePropertyView();
 
 			framework.deleteJavaScriptProperty("visualModel", framework.getJavaScriptGlobalScope());
@@ -1045,7 +1049,7 @@
 				JOptionPane.showMessageDialog(this, e.getMessage(),	"Model export failed", JOptionPane.ERROR_MESSAGE);
 			}
 			we.setChanged(false);
-			refreshTitle(we);
+			refreshWorkspaceEntryTitle(we, true);
 			lastSavePath = we.getFile().getParent();
 			pushRecentFile(we.getFile().getPath(), true);
 		}
@@ -1058,7 +1062,7 @@
 	}
 
 	private String getFileNameForCurrentWork() {
-		String fileName = "";
+		String fileName = TITLE_PLACEHOLDER;
 		if (editorInFocus != null) {
 			WorkspaceEntry we = editorInFocus.getWorkspaceEntry();
 			if (we != null) {
@@ -1098,7 +1102,7 @@
 				throw new RuntimeException("Cannot save workspace entry - it does not have an associated Workcraft model.");
 			}
 			we.setChanged(false);
-			refreshTitle(we);
+			refreshWorkspaceEntryTitle(we, true);
 			lastSavePath = we.getFile().getParent();
 			pushRecentFile(we.getFile().getPath(), true);
 		} catch (SerialisationException e) {
@@ -1168,7 +1172,7 @@
 	}
 
 	private String getTitle(WorkspaceEntry we, VisualModel model) {
-		String prefix = (we.isChanged() ? "*" : "");
+		String prefix = (we.isChanged() ? "*" : TITLE_PLACEHOLDER);
 		String suffix = null;
 		switch (CommonEditorSettings.getTitleStyle()) {
 		case LONG: 
@@ -1178,25 +1182,34 @@
 			suffix = " [" + model.getShortName() + "]";
 			break;
 		default: 
-			suffix = "";
+			suffix = TITLE_PLACEHOLDER;
 			break;
 		}
 		return (prefix + we.getTitle() + suffix);
 	}
-
-	public void refreshTitle(WorkspaceEntry we) {
+	
+	public void refreshWorkspaceEntryTitle(WorkspaceEntry we, boolean updateHeaders) {
 		for (DockableWindow w : editorWindows.get(we)) {
 			final GraphEditorPanel editor = getCurrentEditor();
 			String title = getTitle(we, editor.getModel());
-			w.getContentPanel().setTitle(title);
-			w.setTabText(title);
-		}
-		DockableWindow.updateHeaders(rootDockingPort,getDefaultActionListener());
+			w.setTitle(title);
+		}
+		if (updateHeaders) {
+			DockableWindow.updateHeaders(rootDockingPort, getDefaultActionListener());
+		}
 	}
 
-	public void refreshAllTitles() {
+	public void refreshWorkspaceEntryTitles() {
 		for (WorkspaceEntry we : editorWindows.keySet()) {
-			refreshTitle(we);
+			refreshWorkspaceEntryTitle(we, false);
+		}
+		DockableWindow.updateHeaders(rootDockingPort, getDefaultActionListener());
+	}
+
+	public void setDockableTitle(DockableWindow dockable, String title) {
+		if (dockable != null) {
+			dockable.setTitle(title);
+			DockableWindow.updateHeaders(rootDockingPort, getDefaultActionListener());
 		}
 	}
 
@@ -1221,7 +1234,8 @@
 	public void closeActiveEditor() throws OperationCancelledException {
 		for (WorkspaceEntry k : editorWindows.keySet()) {
 			for (DockableWindow w : editorWindows.get(k)) {
-				if (w.getContentPanel().getContent() == editorInFocus) {
+				DockableWindowContentPanel contentPanel = w.getContentPanel();
+				if ((contentPanel != null) && (contentPanel.getContent() == editorInFocus)) {
 					closeDockableWindow(w);
 					return;
 				}
@@ -1323,7 +1337,7 @@
 		dlg.setModal(true);
 		dlg.setResizable(true);
 		dlg.setVisible(true);
-		refreshAllTitles();
+		refreshWorkspaceEntryTitles();
 	}
 
 	public void resetLayout() {
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/MainWindowActions.java'
--- WorkcraftCore/src/org/workcraft/gui/MainWindowActions.java	2015-01-26 22:10:33 +0000
+++ WorkcraftCore/src/org/workcraft/gui/MainWindowActions.java	2015-06-26 22:23:53 +0000
@@ -39,7 +39,10 @@
 	public static final Action SAVE_WORK_ACTION = new Action() {
 		@Override public void run() {
 			final Framework f = Framework.getInstance();
-			try { f.getMainWindow().saveWork(); } catch (OperationCancelledException e) { }
+			try {
+				f.getMainWindow().saveWork();
+			} catch (OperationCancelledException e) {
+			}
 		}
 		@Override public String getText() {
 			return "Save work";
@@ -48,7 +51,10 @@
 	public static final Action SAVE_WORK_AS_ACTION = new Action() {
 		@Override public void run() {
 			final Framework f = Framework.getInstance();
-			try { f.getMainWindow().saveWorkAs(); } catch (OperationCancelledException e) { }
+			try {
+				f.getMainWindow().saveWorkAs(); 
+			} catch (OperationCancelledException e) {
+			}
 		}
 		public String getText() {
 			return "Save work as...";
@@ -57,7 +63,10 @@
 	public static final Action CLOSE_ACTIVE_EDITOR_ACTION = new Action() {
 		@Override public void run() {
 			final Framework f = Framework.getInstance();
-			try { f.getMainWindow().closeActiveEditor(); } catch (OperationCancelledException e) { }
+			try { 
+				f.getMainWindow().closeActiveEditor(); 
+			} catch (OperationCancelledException e) { 
+			}
 		}
 		public String getText() {
 			return "Close active work";
@@ -67,7 +76,10 @@
 	public static final Action CLOSE_ALL_EDITORS_ACTION = new Action() {
 		@Override public void run() {
 			final Framework f = Framework.getInstance();
-			try { f.getMainWindow().closeEditorWindows(); } catch (OperationCancelledException e) { }
+			try { 
+				f.getMainWindow().closeEditorWindows();
+			} catch (OperationCancelledException e) {
+			}
 		}
 		public String getText() {
 			return "Close all works";
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/PropertyEditorWindow.java'
--- WorkcraftCore/src/org/workcraft/gui/PropertyEditorWindow.java	2015-04-14 13:26:34 +0000
+++ WorkcraftCore/src/org/workcraft/gui/PropertyEditorWindow.java	2015-06-26 22:23:53 +0000
@@ -34,7 +34,7 @@
 	private PropertyEditorTable propertyTable;
 	private JScrollPane scrollProperties;
 
-	public PropertyEditorWindow () {
+	public PropertyEditorWindow() {
 		propertyTable = new PropertyEditorTable();
 
 		scrollProperties = new JScrollPane();
@@ -45,19 +45,19 @@
 		validate();
 	}
 	
-	public Properties getObject () {
+	public Properties getObject() {
 		return propertyTable.getObject();
 	}
 
-	public void setObject (Properties o) {
+	public void setObject(Properties o) {
 		removeAll();
-		propertyTable.setObject(o);
+		propertyTable.setObject(o);
 		add(scrollProperties, BorderLayout.CENTER);
 		validate();
 		repaint();
 	}
 
-	public void clearObject () {
+	public void clearObject() {
 		if (propertyTable.getObject() != null) {
 			removeAll();
 			propertyTable.clearObject();
 
=== added file 'WorkcraftCore/src/org/workcraft/gui/SilverOceanTheme.java'
--- WorkcraftCore/src/org/workcraft/gui/SilverOceanTheme.java	1970-01-01 00:00:00 +0000
+++ WorkcraftCore/src/org/workcraft/gui/SilverOceanTheme.java	2015-06-26 22:23:53 +0000
@@ -0,0 +1,132 @@
+package org.workcraft.gui;
+
+import java.awt.Font;
+import java.awt.Toolkit;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.swing.BorderFactory;
+import javax.swing.UIDefaults;
+import javax.swing.plaf.BorderUIResource;
+import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.FontUIResource;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+import javax.swing.plaf.metal.OceanTheme;
+
+public class SilverOceanTheme extends OceanTheme {
+	
+	private static final double FONT_SIZE = 11.0;
+	private static final String FONT_NAME = "Verdana";
+	
+	public static void enable() {
+		MetalLookAndFeel.setCurrentTheme(new SilverOceanTheme());
+	}
+	
+	@Override
+	public FontUIResource getControlTextFont() {
+	    int screenDpi = Toolkit.getDefaultToolkit().getScreenResolution();
+	    int fontSizeInPixels = (int)Math.round(FONT_SIZE * screenDpi / 72.0);
+		return new FontUIResource(FONT_NAME, Font.PLAIN, fontSizeInPixels);
+	}
+	
+	@Override
+	public FontUIResource getMenuTextFont() {
+		return getControlTextFont();
+	}					
+	
+	@Override
+	public FontUIResource getSubTextFont() {
+		return getControlTextFont();
+	}
+	
+	@Override
+	public FontUIResource getSystemTextFont() {
+		return getControlTextFont();
+	}		
+	
+	@Override
+	public FontUIResource getUserTextFont() {
+		return getControlTextFont();
+	}
+	
+	@Override
+	public FontUIResource getWindowTitleFont() {
+		return new FontUIResource(getControlTextFont().deriveFont(Font.BOLD));
+	}
+	
+	@Override
+	protected ColorUIResource getSecondary1() {
+		return new ColorUIResource(0x999999);
+	}
+	
+	@Override
+	protected ColorUIResource getSecondary2() {
+		return  new ColorUIResource(0xcccccc);
+	}
+
+	@Override
+	protected ColorUIResource getSecondary3() {
+		return  new ColorUIResource(0xeeeeee);
+	}
+	
+	@Override
+	protected ColorUIResource getPrimary1() {
+		return new ColorUIResource(0x999999);
+	}
+
+	@Override
+	protected ColorUIResource getPrimary2() {
+		return new ColorUIResource(0xbbccdd);
+	}
+
+	@Override
+	protected ColorUIResource getPrimary3() {
+		return new ColorUIResource(0xbbccdd);
+	}
+	
+	@Override
+	public void addCustomEntriesToTable(UIDefaults table) {
+		super.addCustomEntriesToTable(table);
+		
+		List<Serializable> buttonGradient = Arrays.asList(1.0, 0.0, getSecondary3(), getSecondary2(), getSecondary2());
+		BorderUIResource menuItemBorder = new BorderUIResource(BorderFactory.createEmptyBorder(3, 6, 3, 6));
+		
+		Object[] uiDefaults = {
+				"Button.gradient", buttonGradient,
+				"CheckBox.gradient", buttonGradient,
+				"CheckBoxMenuItem.gradient", buttonGradient,
+				"InternalFrame.activeTitleGradient", buttonGradient,
+				"RadioButton.gradient", buttonGradient,
+				"RadioButtonMenuItem.gradient", buttonGradient,
+				"ScrollBar.gradient", buttonGradient,
+				"Slider.focusGradient", buttonGradient,
+				"Slider.gradient", buttonGradient,
+				"ToggleButton.gradient", buttonGradient,
+
+				"TabbedPane.selected", getPrimary2(),
+				"TabbedPane.contentAreaColor", getPrimary2(),
+				
+//				"OptionPane.errorIcon", new IconUIResource(ImageLoader.loadIcon("ix")),
+//				"OptionPane.informationIcon", new IconUIResource(ImageLoader.loadIcon("ii")),
+//				"OptionPane.questionIcon", new IconUIResource(ImageLoader.loadIcon("iq")),
+//				"OptionPane.warningIcon", new IconUIResource(ImageLoader.loadIcon("iw")),
+				
+				"Menu.border", new BorderUIResource(BorderFactory.createEmptyBorder(3, 2, 3, 2)),
+				"MenuItem.border", menuItemBorder,
+				"CheckBoxMenuItem.border", menuItemBorder,
+				"RadioButtonMenuItem.border", menuItemBorder,
+
+				"ComboBox.background", getWhite(),
+//				"CheckBox.background", white,
+//				"OptionPane.background", white,
+//				"Panel.background", white,
+//				"Slider.background", white,
+				
+//				"TextField.background", new ColorUIResource(0xf4f4f4),
+				"TextField.border", BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(getPrimary1()), BorderFactory.createEmptyBorder(4, 4, 4, 4)),
+		};
+		table.putDefaults(uiDefaults);
+	}
+
+}
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/graph/GraphEditorPanel.java'
--- WorkcraftCore/src/org/workcraft/gui/graph/GraphEditorPanel.java	2015-04-23 22:59:53 +0000
+++ WorkcraftCore/src/org/workcraft/gui/graph/GraphEditorPanel.java	2015-06-26 22:23:53 +0000
@@ -38,7 +38,6 @@
 import java.awt.event.KeyEvent;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
-import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -82,7 +81,11 @@
 
 public class GraphEditorPanel extends JPanel implements StateObserver, GraphEditor {
 	
-	public OutputStream backup;
+
+	public static final String TITLE_SUFFIX_TEMPLATE = "template";
+	public static final String TITLE_SUFFIX_MODEL = "model";
+	public static final String TITLE_SUFFIX_SINGLE_ELEMENT = "single element";
+	public static final String TITLE_SUFFIX_SELECTED_ELEMENTS = " selected elements";
 
 	class Resizer implements ComponentListener {
 
@@ -533,8 +536,7 @@
 	
 	public void updatePropertyView() { 
 		ModelProperties properties;
-		String titlePrefix = "Property editor";
-		String titleSuffix = "";
+		String titleSuffix = null;
 		VisualNode templateNode = getModel().getTemplateNode();
 		if (templateNode != null) {
 			properties = getNodeProperties(templateNode);
@@ -543,36 +545,35 @@
 					properties.remove(pd);
 				}
 			}
-			titlePrefix += " [template]";
+			titleSuffix = TITLE_SUFFIX_TEMPLATE;
 		} else {
 			Collection<Node> selection = getModel().getSelection();
 			if (selection.size() == 0) {
 				properties = getModelProperties();
-				titleSuffix += " [model]";
+				titleSuffix = TITLE_SUFFIX_MODEL;
 			} else	if (selection.size() == 1) {
 				Node node = selection.iterator().next();
 				properties = getNodeProperties(node);
-				titleSuffix += " [single element]";
+				titleSuffix = TITLE_SUFFIX_SINGLE_ELEMENT;
 			} else {
 				properties = getSelectionProperties(selection);
 				int nodeCount = selection.size();
-				titleSuffix += " [" + nodeCount + " selected elements]";
+				titleSuffix = nodeCount + " " + TITLE_SUFFIX_SELECTED_ELEMENTS;
 			}
 		}
 
 		final PropertyEditorWindow propertyEditorWindow = mainWindow.getPropertyView();
 		if(properties.getDescriptors().isEmpty()) {
 			propertyEditorWindow.clearObject();
-			titleSuffix = "";
 		} else {
 			propertyEditorWindow.setObject(propertiesWrapper(properties));
 		}
 		
-		final DockableWindow propertyEditorDockable = mainWindow.getPropertyEditor();
-		String title = titlePrefix + titleSuffix;
-		propertyEditorDockable.getContentPanel().setTitle(title);
-		propertyEditorDockable.setTabText(title);
-
+		String title = MainWindow.TITLE_PROPERTY_EDITOR;
+		if (titleSuffix != null) {
+			title += " [" + titleSuffix + "]";
+		}
+		mainWindow.setDockableTitle(mainWindow.getPropertyEditor(), title);
 		updatePropertyViewRequested = false;
 	}
 
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/BooleanCellEditor.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/BooleanCellEditor.java	2013-10-07 09:51:12 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/BooleanCellEditor.java	2015-06-26 22:23:53 +0000
@@ -21,26 +21,26 @@
 
 package org.workcraft.gui.propertyeditor;
 
-import java.awt.Component;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-import javax.swing.AbstractCellEditor;
-import javax.swing.JCheckBox;
-import javax.swing.JTable;
-import javax.swing.table.TableCellEditor;
+import java.awt.Component;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+import javax.swing.AbstractCellEditor;
+import javax.swing.JCheckBox;
+import javax.swing.JTable;
+import javax.swing.table.TableCellEditor;
 
 
 @SuppressWarnings("serial")
-public class BooleanCellEditor extends AbstractCellEditor implements
-		TableCellEditor, ItemListener{
+public class BooleanCellEditor extends AbstractCellEditor implements TableCellEditor, ItemListener{
 	
 	private JCheckBox checkBox;
 	
 	public BooleanCellEditor() {
 		 checkBox = new JCheckBox();
 		 checkBox.setFocusable(false);
-		 checkBox.addItemListener(this);
+		 checkBox.addItemListener(this);
+		 checkBox.setBorderPainted(false);
 	}
 	
 	public Component getTableCellEditorComponent(
@@ -49,6 +49,7 @@
 			checkBox.setSelected((Boolean)value);
 		}
 		checkBox.setOpaque(value == null);
+		checkBox.setFont(table.getFont());
 		return checkBox;
 	}
 
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/ChoiceCellEditor.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/ChoiceCellEditor.java	2013-10-07 09:51:12 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/ChoiceCellEditor.java	2015-06-26 22:23:53 +0000
@@ -26,6 +26,7 @@
 import java.awt.event.ItemListener;
 
 import javax.swing.AbstractCellEditor;
+import javax.swing.BorderFactory;
 import javax.swing.JComboBox;
 import javax.swing.JTable;
 import javax.swing.table.TableCellEditor;
@@ -40,7 +41,8 @@
 		comboBox = new JComboBox();
 		comboBox.setEditable(false);
 		comboBox.setFocusable(false);
-		comboBox.addItemListener(this);
+		comboBox.addItemListener(this);
+		comboBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		
 		int declCount = decl.getChoice().size();
 		wrappers = new ChoiceWrapper[declCount];
@@ -76,6 +78,7 @@
 			}
 		}
 		comboBox.setOpaque(value == null);
+		comboBox.setFont(table.getFont());
 		return comboBox;
 	}
 
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/ColorCellEditor.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/ColorCellEditor.java	2014-04-09 22:33:19 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/ColorCellEditor.java	2015-06-26 22:23:53 +0000
@@ -52,12 +52,12 @@
 	static JColorChooser chooser = null;
 	static JDialog dialog = null;
 		
-	protected static final String EDIT = "edit";
+	protected static final String TAG_EDIT = "edit";
 
 	public  ColorCellEditor() {
 
 		button = new JButton();
-		button.setActionCommand(EDIT);
+		button.setActionCommand(TAG_EDIT);
 		button.addActionListener(this);
 		button.setBorderPainted(false);
 		button.setFocusable(false);
@@ -78,7 +78,7 @@
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		if (EDIT.equals(e.getActionCommand())) {
+		if (TAG_EDIT.equals(e.getActionCommand())) {
 			// The user has clicked the cell, so bring up the dialog.
 			approx.target = this;
 			button.setBackground(color);
@@ -86,7 +86,7 @@
 			dialog.setVisible(true);
 			fireEditingStopped(); //Make the renderer reappear.
 		} else { 
-			//User pressed dialog's "OK" button.
+			// User pressed dialog's "OK" button.
 			color = chooser.getColor();
 		}
 	}
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/ColorCellRenderer.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/ColorCellRenderer.java	2014-04-09 22:33:19 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/ColorCellRenderer.java	2015-06-26 22:23:53 +0000
@@ -21,21 +21,17 @@
 
 package org.workcraft.gui.propertyeditor;
 
-import java.awt.Color;
-import java.awt.Component;
-
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
-import javax.swing.JTable;
-import javax.swing.border.Border;
-import javax.swing.table.TableCellRenderer;
+import java.awt.Color;
+import java.awt.Component;
+
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.table.TableCellRenderer;
 
 @SuppressWarnings("serial")
 public class ColorCellRenderer extends JLabel implements TableCellRenderer {
-    Border unselectedBorder = null;
-    Border selectedBorder = null;
-
-    public ColorCellRenderer() {
+
+	public ColorCellRenderer() {
         setOpaque(true); //MUST do this for background to show up.
         setFocusable(false);
     }
@@ -43,22 +39,10 @@
     @Override
     public Component getTableCellRendererComponent(JTable table, Object value,
     		boolean isSelected, boolean hasFocus, int row, int column) {
+    	setBorder(PropertyEditorTable.BORDER_RENDER);
     	if (value != null) {
     		setBackground((Color)value);
-    		if (isSelected) {
-    			if (selectedBorder == null) {
-    				selectedBorder = BorderFactory.createMatteBorder(
-    						2, 5, 2, 5, table.getSelectionBackground());
-    			}
-    			setBorder(selectedBorder);
-    		} else {
-    			if (unselectedBorder == null) {
-    				unselectedBorder = BorderFactory.createMatteBorder(
-    						2, 5, 2, 5, table.getBackground());
-    			}
-    			setBorder(unselectedBorder);
-    		}
-    	}
+    	}
         return this;
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/DefaultCellRenderer.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/DefaultCellRenderer.java	2013-10-07 09:51:12 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/DefaultCellRenderer.java	2015-06-26 22:23:53 +0000
@@ -13,12 +13,15 @@
 	public Component getTableCellRendererComponent(JTable table, Object value,
 			boolean isSelected, boolean hasFocus, int row, int column) {
 		if (value != null) {
-			setText((String)value);
+			String text = value.toString();
+			setText(text);
+			setFont(table.getFont());
+			setOpaque(text.isEmpty());
 		} else {
 			setText("");
+			setOpaque(true);
 		}
-		setFont(table.getFont());
-		setOpaque(value == null || value.equals(""));
+		setBorder(PropertyEditorTable.BORDER_RENDER);
 		return this;
 	}
 
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/FileCellEditor.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/FileCellEditor.java	2015-02-09 10:46:28 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/FileCellEditor.java	2015-06-26 22:23:53 +0000
@@ -18,8 +18,8 @@
 @SuppressWarnings("serial")
 public class FileCellEditor extends AbstractCellEditor implements TableCellEditor, ActionListener {
 	
-	protected static final String EDIT = "edit";
-	protected static final String CLEAR = "clear";
+	protected static final String TAG_EDIT = "edit";
+	protected static final String TAG_CLEAR = "clear";
 	
 	final private JPanel panel;
 	final private JButton chooseButton;
@@ -28,7 +28,7 @@
 
 	public FileCellEditor() {
 		chooseButton = new JButton();
-		chooseButton.setActionCommand(EDIT);
+		chooseButton.setActionCommand(TAG_EDIT);
 		chooseButton.addActionListener(this);
 		chooseButton.setOpaque(true);
 		chooseButton.setBorderPainted(false);
@@ -37,7 +37,7 @@
 		chooseButton.setHorizontalAlignment(SwingConstants.LEFT);
 		
 		clearButton = new JButton("x");
-		clearButton.setActionCommand(CLEAR);
+		clearButton.setActionCommand(TAG_CLEAR);
 		clearButton.addActionListener(this);
 		clearButton.setFocusable(false);
 		clearButton.setMargin(new Insets(1, 1, 1, 1));
@@ -50,7 +50,7 @@
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		if (EDIT.equals(e.getActionCommand())) {
+		if (TAG_EDIT.equals(e.getActionCommand())) {
 			JFileChooser fc = new JFileChooser();
 			fc.setDialogType(JFileChooser.OPEN_DIALOG);
 			fc.setMultiSelectionEnabled(false);
@@ -59,7 +59,7 @@
 			if (fc.showDialog(null, "Open") == JFileChooser.APPROVE_OPTION) {
 				file = fc.getSelectedFile();
 			}
-		} else if (CLEAR.equals(e.getActionCommand())) {
+		} else if (TAG_CLEAR.equals(e.getActionCommand())) {
 			file = null;
 		}
 		fireEditingStopped();
@@ -74,6 +74,7 @@
 	public Component getTableCellEditorComponent(
 			JTable table, Object value, boolean isSelected, int row, int column) {
     	file = (File)value;
+    	panel.setFont(table.getFont());
 		return panel;
 	}
 
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/GenericCellEditor.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/GenericCellEditor.java	2014-07-30 19:51:21 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/GenericCellEditor.java	2015-06-26 22:23:53 +0000
@@ -37,6 +37,7 @@
 	public GenericCellEditor() {
 		textField = new JTextField();
 		textField.setFocusable(true);
+		textField.setBorder(PropertyEditorTable.BORDER_EDIT);
 		textField.addFocusListener(new FocusAdapter() {
 			@Override
 		    public void focusLost(FocusEvent e) {
@@ -50,8 +51,9 @@
 	}
 
 	public Component getTableCellEditorComponent(JTable table, Object value,
-			boolean isSelected,	int row, int column) {
-		textField.setText(value.toString());
+			boolean isSelected,	int row, int column) {
+		textField.setText(value.toString());
+		textField.setFont(table.getFont());
 		return textField;
 	}
 }
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/ModelProperties.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/ModelProperties.java	2015-01-12 22:28:11 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/ModelProperties.java	2015-06-26 22:23:53 +0000
@@ -54,6 +54,19 @@
 			propertyDescriptors.addAll(descriptors);
 		}
 	}
+
+	public void addSorted(final Collection<PropertyDescriptor> descriptors) {
+		if (descriptors != null) {
+			LinkedList<PropertyDescriptor> sortedDescriptors = new LinkedList<PropertyDescriptor>(descriptors);
+			Collections.sort(sortedDescriptors, new Comparator<PropertyDescriptor>() {
+				@Override
+				public int compare(PropertyDescriptor o1, PropertyDescriptor o2) {
+					return (o1.getName().compareTo(o2.getName())); 
+				}
+			});
+			propertyDescriptors.addAll(sortedDescriptors);
+		}
+	}
 	
 	public void remove(final PropertyDescriptor descriptor) {
 		if (descriptor != null) {
@@ -75,14 +88,5 @@
 	public Collection<PropertyDescriptor> getDescriptors() {
 		return Collections.unmodifiableList(propertyDescriptors);
 	}
-	
-	public void sortByPropertyName() {
-		Collections.sort(propertyDescriptors, new Comparator<PropertyDescriptor>() {
-			@Override
-			public int compare(PropertyDescriptor o1, PropertyDescriptor o2) {
-				return (o1.getName().compareTo(o2.getName())); 
-			}
-		});
-	}
 
 }
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/NamePropertyDescriptor.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/NamePropertyDescriptor.java	2015-04-13 18:41:37 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/NamePropertyDescriptor.java	2015-06-26 22:23:53 +0000
@@ -9,6 +9,8 @@
 import org.workcraft.observation.PropertyChangedEvent;
 
 public class NamePropertyDescriptor implements PropertyDescriptor {
+	public static final String PROPERTY_NAME = "Name";
+	
 	private final AbstractModel model;
 	private final Node node;
 
@@ -26,7 +28,7 @@
 	public void setValue(Object value) throws InvocationTargetException {
 		model.setName(node, (String)value);
 		if (node instanceof ObservableState) {
-			((ObservableState)node).sendNotification(new PropertyChangedEvent(node, "name"));
+			((ObservableState)node).sendNotification(new PropertyChangedEvent(node, PROPERTY_NAME));
 		}
 	}
 
@@ -37,7 +39,7 @@
 
 	@Override
 	public String getName() {
-		return "Name";
+		return PROPERTY_NAME;
 	}
 
 	@Override
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/PropertyEditorTable.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/PropertyEditorTable.java	2015-05-22 17:42:39 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/PropertyEditorTable.java	2015-06-26 22:23:53 +0000
@@ -22,21 +22,33 @@
 package org.workcraft.gui.propertyeditor;
 
 import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.util.HashMap;
 
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
+import javax.swing.border.Border;
 import javax.swing.event.ChangeEvent;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 
 import org.workcraft.Framework;
+import org.workcraft.PluginManager;
+import org.workcraft.dom.visual.FontHelper;
 import org.workcraft.plugins.PluginInfo;
 
 @SuppressWarnings("serial")
 public class PropertyEditorTable extends JTable implements PropertyEditor {
+	public static final Border BORDER_RENDER = BorderFactory.createEmptyBorder(1, 3, 1, 1);
+	public static final Border BORDER_EDIT = BorderFactory.createEmptyBorder(0, 3, 1, 1);
+	
 	HashMap<Class<?>, PropertyClass> propertyClasses;
 	TableCellRenderer cellRenderers[];
 	TableCellEditor cellEditors[];
@@ -46,11 +58,12 @@
 		super();
 
 		model = new PropertyEditorTableModel();
-		setModel(model);
-		
+		setModel(model);
+
 		setTableHeader(null);
 		setFocusable(false);
-		
+		setRowHeight(FontHelper.getFontSizeInPixels(getFont()));
+
 		propertyClasses = new HashMap<Class<?>, PropertyClass>();
 		propertyClasses.put(int.class, new IntegerProperty());
 		propertyClasses.put(Integer.class, new IntegerProperty());
@@ -63,7 +76,8 @@
 		propertyClasses.put(URI.class, new FileProperty());
 
 		final Framework framework = Framework.getInstance();
-		for(PluginInfo<? extends PropertyClassProvider> plugin : framework.getPluginManager().getPlugins(PropertyClassProvider.class)) {
+		PluginManager pluginManager = framework.getPluginManager();
+		for(PluginInfo<? extends PropertyClassProvider> plugin : pluginManager.getPlugins(PropertyClassProvider.class)) {
 			PropertyClassProvider instance = plugin.newInstance();
 			propertyClasses.put(instance.getPropertyType(), instance.getPropertyGui());
 		}
@@ -71,18 +85,46 @@
 
 	@Override
 	public TableCellEditor getCellEditor(int row, int col) {
-		if (col == 0)
+		if (col == 0) {
 			return super.getCellEditor(row, col);
-		else
-			return cellEditors[row];
+		} else {
+			return cellEditors[row];
+		}
 	}
 
 	@Override
-	public TableCellRenderer getCellRenderer(int row, int col) {
-		if (col == 0)
-			return super.getCellRenderer(row, col);
-		else
-			return cellRenderers[row];
+	public TableCellRenderer getCellRenderer(int row, int col) {
+		if (col > 0) {
+			return cellRenderers[row];
+		} else {
+			return new TableCellRenderer() {
+				private final JLabel label = new JLabel() {
+					@Override
+					public void paint( Graphics g ) {
+						g.setColor(getBackground());
+						g.fillRect(0, 0, getWidth() - 1, getHeight() - 1);
+						super.paint(g);
+					}
+				};
+				
+				@Override
+				public Component getTableCellRendererComponent(JTable table, Object value, 
+						boolean isSelected, boolean hasFocus, int row, int column) {
+					label.setText(value.toString());
+					label.setBorder(BORDER_RENDER);
+					PropertyDescriptor descriptor = model.getRowDeclaration(row);
+					try {
+						if (descriptor.getValue() == null) {
+							Font boldFont = label.getFont().deriveFont(Font.BOLD);
+							label.setFont(boldFont);
+						}
+					} catch (InvocationTargetException e) {
+					}
+					//label.setEnabled(false);
+					return label;
+				}
+			};
+		}
 	}
 
 	@Override
@@ -93,11 +135,8 @@
 	@Override
 	public void setObject(Properties o) {
 		model.setObject(o);
-
 		cellRenderers = new TableCellRenderer[model.getRowCount()];
 		cellEditors = new TableCellEditor[model.getRowCount()];
-		
-
 		for (int i = 0; i < model.getRowCount(); i++) {
 			PropertyDescriptor decl = model.getRowDeclaration(i);
 			
@@ -105,21 +144,19 @@
 			if (decl.getChoice() != null) {
 				model.setRowClass(i, null);
 				cellRenderers[i] = new DefaultCellRenderer();
-				ChoiceCellEditor ce = new ChoiceCellEditor(decl);
-				cellEditors[i] = ce;
+				cellEditors[i] = new ChoiceCellEditor(decl);
 			} else {
 				// otherwise, try to get a corresponding PropertyClass object, that knows how to edit a property of this class
 				PropertyClass cls = propertyClasses.get(decl.getType());
 				model.setRowClass(i, cls);
-				if (cls == null) {
+				if (cls != null) {
+					cellRenderers[i] = cls.getCellRenderer();
+					cellEditors[i] = cls.getCellEditor();
+				} else {
 					// no PropertyClass exists for this class, fall back to read-only mode using Object.toString()
 					System.err.println("Data class \"" + decl.getType().getName() + "\" is not supported by the Property Editor.");
-					
-					cellRenderers[i] = new DefaultTableCellRenderer();
+					cellRenderers[i] = new DefaultTableCellRenderer();
 					cellEditors[i] = null;
-				} else {
-					cellRenderers[i] = cls.getCellRenderer();
-					cellEditors[i] = cls.getCellEditor();
 				}
 			}
 		}
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/PropertyEditorTableModel.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/PropertyEditorTableModel.java	2015-02-09 10:46:28 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/PropertyEditorTableModel.java	2015-06-26 22:23:53 +0000
@@ -66,25 +66,28 @@
 	}
 
 	public int getColumnCount() {
-		if (object == null)
+		if (object == null) {
 			return 0;
-		else
-			return 2;
+		} else {
+			return 2;
+		}
 	}
 
 	public int getRowCount() {
-		if (object == null)
+		if (object == null) {
 			return 0;
-		else
-			return declarations.length;
+		} else {
+			return declarations.length;
+		}
 	}
 
 	@Override
 	public boolean isCellEditable(int row, int col) {
-		if (col == 0)
+		if (col == 0) {
 			return false;
-		else
-			return (declarations[row].isWritable());
+		} else {
+			return (declarations[row].isWritable());
+		}
 	}
 
 	public PropertyDescriptor getRowDeclaration(int i) {
@@ -92,26 +95,27 @@
 	}
 
 	public Object getValueAt(int row, int col) {
-		if (col ==0 )
+		if (col == 0) {
 			return declarations[row].getName();
-		else try {
-			Object value = declarations[row].getValue();
-			if (rowClasses[row] != null)
-				return rowClasses[row].toCellRendererValue(value);
-			else
-			{
-				Map<? extends Object, String> choice = declarations[row].getChoice();
-				if(choice != null) 
-					return choice.get(value);
-				else
-					return value.toString();
+		} else {
+			try {
+				Object value = declarations[row].getValue();
+				if (rowClasses[row] != null) {
+					return rowClasses[row].toCellRendererValue(value);
+				} else {
+					Map<? extends Object, String> choice = declarations[row].getChoice();
+					if(choice != null) { 
+						return choice.get(value);
+					} else {
+						return value.toString();
+					}
+				}
+			} catch (Throwable e) {
+				return "#EXCEPTION";
 			}
-		} catch (Throwable e) {
-			e.printStackTrace();
-			return "#EXCEPTION";
 		}
-	}
-
+	}
+	
 	@Override
 	public void setValueAt(Object value, int row, int col) {
 		PropertyDescriptor desc = declarations[row]; 
@@ -128,4 +132,5 @@
 	public Properties getObject() {
 		return object;
 	}
-}
 \ No newline at end of file
+
+}
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/propertyeditor/StringProperty.java'
--- WorkcraftCore/src/org/workcraft/gui/propertyeditor/StringProperty.java	2014-04-09 22:33:19 +0000
+++ WorkcraftCore/src/org/workcraft/gui/propertyeditor/StringProperty.java	2015-06-26 22:23:53 +0000
@@ -45,7 +45,7 @@
 	public Object toCellRendererValue(Object value) {
 		String result = "";
 		if (value != null) {
-			result = "" + value;
+			result = value.toString();
 		}
 		return result;
 	}
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/trees/TreeWindow.java'
--- WorkcraftCore/src/org/workcraft/gui/trees/TreeWindow.java	2015-02-10 15:21:12 +0000
+++ WorkcraftCore/src/org/workcraft/gui/trees/TreeWindow.java	2015-06-26 22:23:53 +0000
@@ -220,8 +220,9 @@
 
 				String name = decorator.getName(node);
 				boolean tricky = name.startsWith("!");
-				if (tricky)
+				if (tricky) {
 					name = name.substring(1);
+				}
 				Component res = super.getTreeCellRendererComponent(tree, name, sel, expanded, leaf, row, hasFocus);
 
 
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/workspace/WorkspacePopupProvider.java'
--- WorkcraftCore/src/org/workcraft/gui/workspace/WorkspacePopupProvider.java	2015-01-20 18:45:18 +0000
+++ WorkcraftCore/src/org/workcraft/gui/workspace/WorkspacePopupProvider.java	2015-06-26 22:23:53 +0000
@@ -197,34 +197,29 @@
 				ListMap<String, Pair<String, Tool>> applicableTools = Tools.getTools(openFile);
 				List<String> sections = Tools.getSections(applicableTools);
 
-				if (!sections.isEmpty())
+				if (!sections.isEmpty()) {
 					popup.addSeparator();
-
+				}
 				for (String section : sections) {
-					JMenu m = new JMenu(section);
-
+					String menuName = (section.startsWith("!") ? section.substring(1) : section);
+					JMenu menu = new JMenu(menuName);
 					for (Pair<String, Tool> tool : Tools.getSectionTools(section, applicableTools)) {
-						JMenuItem mi = new JMenuItem(tool.getFirst());
-						tools.put(mi, tool.getSecond());
-
-						mi.addActionListener(new ActionListener() {
+						JMenuItem item = new JMenuItem(tool.getFirst());
+						tools.put(item, tool.getSecond());
+						item.addActionListener(new ActionListener() {
 							public void actionPerformed(ActionEvent e) {
 								Tools.run(openFile, tools.get(e.getSource()));
 							}
 						});
-
-						m.add(mi);
+						menu.add(item);
 					}
-
-					popup.add(m);
+					popup.add(menu);
 				}
 			}
-
 			popup.addSeparator();
 
 			JMenuItem miRemove = new JMenuItem("Delete");
-			miRemove.addActionListener(new ActionListener() 
-			{
+			miRemove.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
 					try {
 						workspace.delete(path);
@@ -235,9 +230,11 @@
 		}
 
 		popup.addSeparator();
-		if(path.isEmpty())
-			for (Component c : wsWindow.createMenu().getMenuComponents())
+		if (path.isEmpty()) {
+			for (Component c : wsWindow.createMenu().getMenuComponents()) {
 				popup.add(c);
+			}
+		}
 		return popup;
 	}
 }
 \ No newline at end of file
 
=== modified file 'WorkcraftCore/src/org/workcraft/serialisation/xml/XMLDeserialiserState.java'
--- WorkcraftCore/src/org/workcraft/serialisation/xml/XMLDeserialiserState.java	2014-07-04 19:54:50 +0000
+++ WorkcraftCore/src/org/workcraft/serialisation/xml/XMLDeserialiserState.java	2015-06-26 22:23:53 +0000
@@ -77,7 +77,7 @@
 	
 	@Override
 	public Object getObject(String reference) {
-		if (reference.equals("")) return null;
+		if (reference.isEmpty()) return null;
 		
 		return internalReferenceMap.getValue(reference);
 	}
 
=== modified file 'WorkcraftCore/src/org/workcraft/util/Tools.java'
--- WorkcraftCore/src/org/workcraft/util/Tools.java	2015-02-11 10:58:21 +0000
+++ WorkcraftCore/src/org/workcraft/util/Tools.java	2015-06-26 22:23:53 +0000
@@ -41,13 +41,13 @@
 		}
 	}
 	
-	public static List<String> getSections (ListMap<String, Pair<String, Tool>> tools) {
+	public static List<String> getSections(ListMap<String, Pair<String, Tool>> tools) {
 		LinkedList<String> list = new LinkedList<String>(tools.keySet());
 		Collections.sort(list);
 		return list;
 	}
 	
-	public static List<Pair<String,Tool>> getSectionTools (String section, ListMap<String, Pair<String, Tool>> tools) {
+	public static List<Pair<String,Tool>> getSectionTools(String section, ListMap<String, Pair<String, Tool>> tools) {
 		List<Pair<String,Tool>> sectionTools = new ArrayList<Pair<String, Tool>>(tools.get(section));
 
 		Collections.sort(sectionTools, new Comparator<Pair<String,Tool>>() {
 
=== modified file 'WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java'
--- WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java	2015-05-19 18:01:37 +0000
+++ WorkcraftCore/src/org/workcraft/workspace/WorkspaceEntry.java	2015-06-26 22:23:53 +0000
@@ -75,7 +75,7 @@
 			}
 			workspace.fireEntryChanged(this);
 			final Framework framework = Framework.getInstance();
-			framework.getMainWindow().refreshTitle(this);
+			framework.getMainWindow().refreshWorkspaceEntryTitle(this, true);
 		}
 	}
 
@@ -199,7 +199,7 @@
 		MainWindowActions.EDIT_SELECT_NONE_ACTION.setEnabled(canModify && canSelect);
 		MainWindow mainWindow = Framework.getInstance().getMainWindow();
 		if (mainWindow != null) {
-			mainWindow.getMainMenu().getToolsMenu().setEnabled(canModify);
+			mainWindow.getMainMenu().updateToolsMenuState(canModify);
 		}
 	}
 
 
=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/QueueComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/QueueComponent.java	2013-11-05 18:01:19 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/QueueComponent.java	2015-06-26 22:23:53 +0000
@@ -26,12 +26,13 @@
 
 @VisualClass(org.workcraft.plugins.xmas.components.VisualQueueComponent.class)
 public class QueueComponent extends XmasComponent {
-
+	public static final String PROPERTY_CAPACITY = "Capacity";
+	
 	public int capacity = 0;
 	
 	public void setCapacity(int capacity) {
 		this.capacity = capacity;
-		sendNotification(new PropertyChangedEvent(this, "capacity"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_CAPACITY));
 	}
 
 	public int getCapacity() {
 
=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualQueueComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualQueueComponent.java	2015-04-13 18:41:37 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualQueueComponent.java	2015-06-26 22:23:53 +0000
@@ -41,6 +41,8 @@
 @Hotkey(KeyEvent.VK_Q)
 @SVGIcon("images/icons/svg/xmas-queue.svg")
 public class VisualQueueComponent extends VisualXmasComponent {
+	public static final String PROPERTY_FOREGROUND_COLOR = "Foreground color";
+	
 	public Color color = new Color(0, 0, 0, 255);
 	
 	public VisualQueueComponent(QueueComponent component) {
@@ -55,7 +57,7 @@
 	
 	private void addPropertyDeclarations() {
 		addPropertyDeclaration(new PropertyDeclaration<VisualQueueComponent, Integer>(
-				this, "Capacity", Integer.class) {
+				this, QueueComponent.PROPERTY_CAPACITY, Integer.class) {
 			public void setter(VisualQueueComponent object, Integer value) {
 				object.getReferencedQueueComponent().setCapacity(value);
 			}
@@ -98,7 +100,7 @@
 	public void setColorRed() {
 		this.color = new Color(255, 0, 0, 255);
 		this.setForegroundColor(new Color(255, 0, 0, 255));
-		sendNotification(new PropertyChangedEvent(this, "foregroundColor"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_FOREGROUND_COLOR));
 	}
 	
 	@Override
 
=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSourceComponent.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSourceComponent.java	2013-11-05 18:01:19 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualSourceComponent.java	2015-06-26 22:23:53 +0000
@@ -37,6 +37,8 @@
 @Hotkey(KeyEvent.VK_I)
 @SVGIcon("images/icons/svg/xmas-source.svg")
 public class VisualSourceComponent extends VisualXmasComponent {
+	public static final String PROPERTY_FOREGROUND_COLOR = "Foreground color";
+	
 	public Color color = new Color(0, 255, 0, 255);
 	
 	public VisualSourceComponent(SourceComponent component) {
@@ -49,7 +51,7 @@
 	public void setColorRed() {
 		this.color = new Color(255, 0, 0, 255);
 		this.setForegroundColor(new Color(255, 0, 0, 255));
-		sendNotification(new PropertyChangedEvent(this, "foregroundColor"));
+		sendNotification(new PropertyChangedEvent(this, PROPERTY_FOREGROUND_COLOR));
 	}
 	
 	@Override
 
=== modified file 'XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasContact.java'
--- XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasContact.java	2015-04-13 18:41:37 +0000
+++ XmasPlugin/src/org/workcraft/plugins/xmas/components/VisualXmasContact.java	2015-06-26 22:23:53 +0000
@@ -41,6 +41,8 @@
 
 
 public class VisualXmasContact extends VisualComponent implements StateObserver {
+	public static final String IO_TYPE_PROPERTY_NAME = "IOtype";
+	
 	private double size = 0.4;
 	
 	public VisualXmasContact(XmasContact contact) {
@@ -70,7 +72,7 @@
 
 	public void setIOType(XmasContact.IOType type) {
 		getReferencedContact().setIOType(type);
-		sendNotification(new PropertyChangedEvent(this, "IOtype"));
+		sendNotification(new PropertyChangedEvent(this, IO_TYPE_PROPERTY_NAME));
 	}
 
 	public XmasContact.IOType getIOType() {