diff --git a/src/main/java/ui/avatarbd/AvatarBDBlock.java b/src/main/java/ui/avatarbd/AvatarBDBlock.java
index 5edc8eddbf1208c35bd8a3ee7ad96d7af27385a9..ed99011fdd084df0e68677e37359549db0310ab3 100644
--- a/src/main/java/ui/avatarbd/AvatarBDBlock.java
+++ b/src/main/java/ui/avatarbd/AvatarBDBlock.java
@@ -208,6 +208,9 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
 
         // Draw inner rectangle
         //graph.setColor(ColorManager.AVATAR_BLOCK);
+
+        //TraceManager.addDev("type stereotype=" + typeStereotype);
+
         graph.setColor(BLOCK_TYPE_COLOR.get(typeStereotype));
         graph.fillRect(this.x + 1, this.y + 1, this.width - 1, this.height - 1);
         graph.setColor(c);
@@ -235,6 +238,8 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
 
         String ster = BLOCK_TYPE_STR.get(typeStereotype);
 
+        //TraceManager.addDev("My ster=" + ster);
+
         if (this.rescaled && !this.tdp.isScaled()) {
             this.rescaled = false;
             // Must set the font size...
@@ -700,19 +705,23 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
 
                 int rgb = dialog.getColor();
 
-                TraceManager.addDev("RGBColor:" + rgb + " vs default color:" + ColorManager.AVATAR_BLOCK.getRGB());
+                //TraceManager.addDev("RGBColor:" + rgb + " vs default color:" + ColorManager.AVATAR_BLOCK.getRGB());
 
                 addStereotype(s, rgb);
 
-                TraceManager.addDev("My stereotype=" + BLOCK_TYPE_STR.get(typeStereotype) + " color=" + BLOCK_TYPE_COLOR.get(typeStereotype).getRGB());
+                //TraceManager.addDev("My stereotype=" + BLOCK_TYPE_STR.get(typeStereotype) + " color=" + BLOCK_TYPE_COLOR.get(typeStereotype).getRGB());
+
 
 
                 if (isCryptoBlock()) {
                     addCryptoElements();
                 } else {
+                    int tmpSter = typeStereotype;
                     removeCryptoElements();
+                    typeStereotype = tmpSter;
                 }
 
+
                 return true;
 
             }
@@ -1146,17 +1155,21 @@ public class AvatarBDBlock extends TGCScalableWithInternalComponent implements S
 
         // Found stereotype
         if (index != -1) {
+            TraceManager.addDev("Found stereotype");
             typeStereotype = index;
             if (index > 0) {
+                TraceManager.addDev("Setting new color");
                 BLOCK_TYPE_COLOR.set(index, new Color(rgb));
             }
             return false;
 
             // Must add a new stereotype
         } else {
+            TraceManager.addDev("No stereotype found: adding" + s + " with color " + rgb);
             BLOCK_TYPE_STR.add(s);
             BLOCK_TYPE_COLOR.add(new Color(rgb));
             typeStereotype = BLOCK_TYPE_STR.size()-1;
+            TraceManager.addDev("Stereotype =" + BLOCK_TYPE_STR.get(typeStereotype) + " typestereotype=" + typeStereotype);
             return true;
         }
     }
diff --git a/ttool/launch_configurations/config.xml b/ttool/launch_configurations/config.xml
index de5ba95d29115225bc66508f952eaace67c9d091..94c26000eab0b5c89e92fdba7b3eaa89cad4ed84 100644
--- a/ttool/launch_configurations/config.xml
+++ b/ttool/launch_configurations/config.xml
@@ -67,10 +67,6 @@
 
 <PLUGIN_JAVA_CODE_GENERATOR data="../plugins/CustomizerAvatarCodeGeneration.jar" />
 
-<LastOpenFile data="/home/satan/TTool/modeling/DIPLODOCUS/ZigBeeTutorial.ttool"/>
-
-<LastWindowAttributes x="65" y="24" width="1301" height="744" max="true" />
-
 
 <ProVerifHash data="1427594573"/>
 </TURTLECONFIGURATION>
diff --git a/ttool/runtime/config.xml b/ttool/runtime/config.xml
index a6629fa26fbd8613777ada32373749f6c1c733b0..b036e28828d48329b83dc3e180fe8ef9bf773764 100755
--- a/ttool/runtime/config.xml
+++ b/ttool/runtime/config.xml
@@ -65,12 +65,6 @@
 <ExternalCommand2 data="/packages/uppaal4.0.11/uppaal ../uppaal/spec.xml"/>
 
 
-<LastOpenFile data="/home/satan/TTool/modeling/DIPLODOCUS/ZigBeeTutorial.ttool"/>
-
-
-
-<LastWindowAttributes x="65" y="-4" width="1301" height="772" max="true" />
-
 
 <ProVerifHash data="1427594573"/>
 </TURTLECONFIGURATION>