diff --git a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/selection-behavior.htm b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/selection-behavior.htm
index aa306c4..e649980c 100644
--- a/examples/org.eclipse.graphiti.doc/resources/docu/gfw/selection-behavior.htm
+++ b/examples/org.eclipse.graphiti.doc/resources/docu/gfw/selection-behavior.htm
@@ -189,48 +189,47 @@
 	font-size:10.0pt;
 	font-family:"Times New Roman","serif";}
 p.Uuml, li.Uuml, div.Uuml
-	{mso-style-name:"&Uuml\,berschrift 1";
-	mso-style-link:"&Uuml6\,berschrift 6 Zchn1";
-	margin:0cm;
+	{mso-style-name:"&Uuml\,'berschrift 1'";
+	mso-style-link:"&Uuml6\,'berschrift 6 Zchn1'";
 	margin-bottom:.0001pt;
 	font-size:12.0pt;
-	font-family:"Times New Roman","serif";}
+	font-family:"Times New Roman","serif"; margin-left:0cm; margin-right:0cm; margin-top:0cm}
 span.Uuml1
-	{mso-style-name:"&Uuml1\,berschrift 1 Zchn1";
-	mso-style-link:"&Uuml\,berschrift 1";
+	{mso-style-name:"&Uuml1\,'berschrift 1 Zchn1'";
+	mso-style-link:"&Uuml\,'berschrift 1'";
 	font-family:"Cambria","serif";
 	color:#365F91;
-	font-weight:bold;}
+	font-weight:bold}
 span.Uuml2
-	{mso-style-name:"&Uuml2\,berschrift 2 Zchn1";
-	mso-style-link:"&Uuml\,berschrift 1";
+	{mso-style-name:"&Uuml2\,'berschrift 2 Zchn1'";
+	mso-style-link:"&Uuml\,'berschrift 1'";
 	font-family:"Cambria","serif";
 	color:#4F81BD;
-	font-weight:bold;}
+	font-weight:bold}
 span.Uuml3
-	{mso-style-name:"&Uuml3\,berschrift 3 Zchn1";
-	mso-style-link:"&Uuml\,berschrift 1";
+	{mso-style-name:"&Uuml3\,'berschrift 3 Zchn1'";
+	mso-style-link:"&Uuml\,'berschrift 1'";
 	font-family:"Cambria","serif";
 	color:#4F81BD;
-	font-weight:bold;}
+	font-weight:bold}
 span.Uuml4
-	{mso-style-name:"&Uuml4\,berschrift 4 Zchn1";
-	mso-style-link:"&Uuml\,berschrift 1";
+	{mso-style-name:"&Uuml4\,'berschrift 4 Zchn1'";
+	mso-style-link:"&Uuml\,'berschrift 1'";
 	font-family:"Cambria","serif";
 	color:#4F81BD;
 	font-weight:bold;
-	font-style:italic;}
+	font-style:italic}
 span.Uuml5
-	{mso-style-name:"&Uuml5\,berschrift 5 Zchn1";
-	mso-style-link:"&Uuml\,berschrift 1";
+	{mso-style-name:"&Uuml5\,'berschrift 5 Zchn1'";
+	mso-style-link:"&Uuml\,'berschrift 1'";
 	font-family:"Cambria","serif";
-	color:#243F60;}
+	color:#243F60}
 span.Uuml6
-	{mso-style-name:"&Uuml6\,berschrift 6 Zchn1";
-	mso-style-link:"&Uuml\,berschrift 1";
+	{mso-style-name:"&Uuml6\,'berschrift 6 Zchn1'";
+	mso-style-link:"&Uuml\,'berschrift 1'";
 	font-family:"Cambria","serif";
 	color:#243F60;
-	font-style:italic;}
+	font-style:italic}
 span.code1
 	{mso-style-name:code1;
 	font-style:italic;}
@@ -619,7 +618,7 @@
   <p class=MsoNormal><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New";
   color:black'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
   lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>
-  gaService.setLocationAndSize(boxRect, -w, -w, 2 * w 2 * w); </span></p>
+  gaService.setLocationAndSize(boxRect, -w, -w, 2 * w, 2 * w); </span></p>
   <p class=MsoNormal style='text-autospace:none'><span lang=EN-US
   style='font-size:10.0pt;font-family:"Courier New";color:black'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   Color c =</span><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>
@@ -811,7 +810,7 @@
   containerGa.getWidth()</span></p>
   <p class=MsoNormal style='text-autospace:none'><span lang=EN-US
   style='font-size:10.0pt;font-family:"Courier New";color:black'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  - TutorialEAddClassFeature.</span><i><span lang=EN-US style='font-size:10.0pt;
+  - TutorialAddEClassFeature.</span><i><span lang=EN-US style='font-size:10.0pt;
   font-family:"Courier New";color:#0000C0'>INVISIBLE_RECT_RIGHT</span></i><span
   lang=EN-US style='font-size:10.0pt;font-family:"Courier New";color:black'>;</span></p>
   <p class=MsoNormal style='text-autospace:none'><span lang=EN-US
@@ -909,7 +908,7 @@
   <p class=MsoNormal style='text-autospace:none'><span lang=EN-US
   style='font-size:10.0pt;font-family:"Courier New";color:black'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span
   lang=EN-US> </span><span lang=EN-US style='font-size:10.0pt;font-family:"Courier New"'>gaService<span
-  style='color:black'>.<i>setWidthOfGraphicsAlgorithm</i>(graphicsAlgorithm,</span></span></p>
+  style='color:black'>.<i>setWidth</i>(graphicsAlgorithm,</span></span></p>
   <p class=MsoNormal style='text-autospace:none'><span lang=EN-US
   style='font-size:10.0pt;font-family:"Courier New";color:black'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   rectangleWidth);</span></p>
@@ -1003,12 +1002,14 @@
 <p class=MsoNormal><span lang=EN-GB style='color:black'>The following methods
 of the tool behavior provider must be overwritten:</span></p>
 
-<p class=MsoNormal><span lang=EN-GB style='color:black'>The method <a
-href="../../../javadoc/org/eclipse/graphiti/tb/IToolBehaviorProvider.html#getSelectionGraphicsAlgorithm(org.eclipse.graphiti.mm.pictograms.PictogramElement)">getSelectionGraphicsAlgorithm</a>
+<p class=MsoNormal><span lang=EN-GB style='color:black'>The method 
+<a href="../../../javadoc/org/eclipse/graphiti/tb/IToolBehaviorProvider.html#getSelectionBorder(org.eclipse.graphiti.mm.pictograms.PictogramElement)">
+getSelectionBorder</a>
 has to return one graphics algorithm, which defines the selection-handle.</span></p>
 
-<p class=MsoNormal><span lang=EN-GB style='color:black'>The method <a
-href="../../../javadoc/org/eclipse/graphiti/tb/IToolBehaviorProvider.html#getSelectionArea(org.eclipse.graphiti.mm.pictograms.PictogramElement)">getSelectionArea</a>
+<p class=MsoNormal><span lang=EN-GB style='color:black'>The method 
+<a href="../../../javadoc/org/eclipse/graphiti/tb/IToolBehaviorProvider.html#getClickArea(org.eclipse.graphiti.mm.pictograms.PictogramElement)">
+getClickArea</a>
 has to return multiple graphics algorithms, which union defines the
 selection-area inside which mouse-clicks activate the selection.</span></p>
 
@@ -1095,7 +1096,7 @@
   lang=EN-US> </span><b><span lang=EN-US style='font-size:10.0pt;font-family:
   "Courier New";color:#7F0055'>public</span></b><span lang=EN-US> </span><span
   lang=EN-US style='font-size:10.0pt;font-family:"Courier New";color:black'>GraphicsAlgorithm
-  getSelectionGraphicsAlgorithm(</span></p>
+  getSelectionBorder(</span></p>
   <p class=MsoNormal style='text-autospace:none'><span lang=EN-US
   style='font-size:10.0pt;font-family:"Courier New";color:black'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   PictogramElement pe) {</span></p>
@@ -1139,7 +1140,7 @@
   lang=EN-US> </span><b><span lang=EN-US style='font-size:10.0pt;font-family:
   "Courier New";color:#7F0055'>return</span></b><span lang=EN-US> </span><b><span
   lang=EN-US style='font-size:10.0pt;font-family:"Courier New";color:#7F0055'>super</span></b><span
-  lang=EN-US style='font-size:10.0pt;font-family:"Courier New";color:black'>.getSelectionGraphicsAlgorithm(pe);</span></p>
+  lang=EN-US style='font-size:10.0pt;font-family:"Courier New";color:black'>.getSelectionBorder(pe);</span></p>
   <p class=MsoNormal style='text-autospace:none'><span lang=EN-US
   style='font-size:10.0pt;font-family:"Courier New";color:black'>&nbsp;&nbsp;&nbsp;</span><span
   lang=EN-US> </span><span style='font-size:10.0pt;font-family:"Courier New";