Index: lams_central/web/css/authoring-svg.css
===================================================================
diff -u -rd23cfe73ee8a02bac48ce02552b1041bb3d3b9f6 -r6d4ea52f24e34bfa5b177e125026c5e2b736216a
--- lams_central/web/css/authoring-svg.css	(.../authoring-svg.css)	(revision d23cfe73ee8a02bac48ce02552b1041bb3d3b9f6)
+++ lams_central/web/css/authoring-svg.css	(.../authoring-svg.css)	(revision 6d4ea52f24e34bfa5b177e125026c5e2b736216a)
@@ -85,6 +85,16 @@
 	stroke: blue;
 }
 
+.svg-annotation-container {
+	stroke: #b6b6b6;
+}
+
+.svg-activity-optional .svg-annotation-container,
+.svg-activity-parallel .svg-annotation-container,
+.svg-activity-floating .svg-annotation-container {
+	fill : #f0f8ff;
+}
+
 .svg-transition {
 	stroke-width: 1;
 	stroke: rgb(119, 126, 157);
Index: lams_central/web/includes/javascript/authoring/authoringDecoration.js
===================================================================
diff -u -rd23cfe73ee8a02bac48ce02552b1041bb3d3b9f6 -r6d4ea52f24e34bfa5b177e125026c5e2b736216a
--- lams_central/web/includes/javascript/authoring/authoringDecoration.js	(.../authoringDecoration.js)	(revision d23cfe73ee8a02bac48ce02552b1041bb3d3b9f6)
+++ lams_central/web/includes/javascript/authoring/authoringDecoration.js	(.../authoringDecoration.js)	(revision 6d4ea52f24e34bfa5b177e125026c5e2b736216a)
@@ -61,15 +61,15 @@
 	methods : {
 		container : {
 			
-			draw : function(x, y, x2, y2, color, borderColor, strokeWidth){
+			draw : function(x, y, x2, y2, color){
 				// check for new coordinates or just take them from the existing shape
 				var box = this.items   ? this.items.shape.getBBox() : null,
 					x = x != undefined ? x : box.x,
 					y = y != undefined ? y : box.y,
 					// take into account minimal size of rectangle
 					x2 = x2 ? Math.max(x2, x + layout.conf.regionEmptyWidth) : x + box.width,
 					y2 = y2 ? Math.max(y2, y + layout.conf.regionEmptyHeight) : y + box.height,
-					color =  color ? color : this.items.shape.attr('fill');
+					color =  !color && this.items ? this.items.shape.attr('fill') : color;
 	
 				if (box) {
 					this.items.remove();
@@ -95,11 +95,6 @@
 					x2 = Math.max(x2, label.getBBox().x2 + 5);
 				}
 				
-				if ( ! borderColor )
-					borderColor = layout.colors.activityBorder;
-				if ( ! strokeWidth )
-					strokeWidth = 0.5;
-				
 				// the rectangle
 				var curve = layout.activity.borderCurve,
 					width = x2 - x,
@@ -108,15 +103,14 @@
 						' v ' + (height - 2 * curve) + ' q 0 ' + curve + ' ' + -curve + ' ' + curve + 
 						' h ' + (-width + 2 * curve) + ' q ' + -curve + ' 0 ' + -curve + ' ' + -curve +
 						' v ' + (-height + 2 * curve) + ' q 0 ' + -curve + ' ' + curve + ' ' + -curve;
-				this.items.shape = paper.path(shapePath)
-						 			    .attr({
-						 			    	'stroke' : borderColor,
-										    'stroke-width' : strokeWidth,
-						 			    	'fill'   : color
-						 			    });
+				this.items.shape = paper.path(shapePath);
+				this.items.shape.addClass('svg-annotation-container');
 				this.items.prepend(this.items.shape);
 				GeneralLib.toBack(this.items);
 				
+				if (color) {
+					this.items.shape.attr('fill', color);
+				}
 				if (isReadOnlyMode){
 					if (activitiesOnlySelectable) {
 						this.items.attr('cursor', 'pointer')
@@ -206,6 +200,7 @@
 		region : {
 			draw : function(x, y, x2, y2, color){
 				this.drawContainer(x, y, x2, y2, color);
+				this.items.addClass('svg-annotation-region');
 				
 				var box = this.items.shape.getBBox();
 				
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r2004cd28f4e47531a37d161b113806665a3aa345 -r6d4ea52f24e34bfa5b177e125026c5e2b736216a
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 2004cd28f4e47531a37d161b113806665a3aa345)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 6d4ea52f24e34bfa5b177e125026c5e2b736216a)
@@ -128,8 +128,6 @@
 			'gateText'     		  : 'white',
 			'grouping'		      : '#caddfb',
 			'groupingBorder'	  : '#00007f',
-			'optionalActivity'    : '#caddfb',
-			'optionalActivityBorder'    : '#00007f',
 			// dashed border around a selected activity 
 			'selectEffect'        : 'black',
 			// highlight TBL activities which should be grouped