Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringActivity.js,v
diff -u -r1.38.2.30 -r1.38.2.31
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	15 Nov 2016 22:35:28 -0000	1.38.2.30
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	16 Nov 2016 13:06:04 -0000	1.38.2.31
@@ -1,4 +1,4 @@
-/**
+/**
  * This file contains methods for Activity definition and manipulation on canvas.
  */
 
@@ -386,12 +386,12 @@
 			this.drawContainer(x, y,
 							   box.x2 + layout.conf.containerActivityPadding,
 							   box.y2 + layout.conf.containerActivityPadding,
-							   layout.colors.optionalActivity);
+							   layout.colors.optionalActivity, layout.colors.optionalActivityBorder, 0.5);
 		} else {
 			this.drawContainer(x, y,
 							   x + layout.conf.containerActivityEmptyWidth,
 							   y + layout.conf.containerActivityEmptyHeight,
-							   layout.colors.optionalActivity);
+							   layout.colors.optionalActivity, layout.colors.optionalActivityBorder, 0.5);
 		}
 		
 		this.items.data('parentObject', this);
@@ -520,12 +520,12 @@
 			this.drawContainer(x, y,
 							  box.x2 + layout.conf.containerActivityPadding,
 							  box.y2 + layout.conf.containerActivityPadding,
-							  layout.colors.optionalActivity);
+							  layout.colors.optionalActivity, layout.colors.optionalActivityBorder, 0.5);
 		} else {
 			this.drawContainer(x, y,
 							   x + layout.conf.containerActivityEmptyWidth,
 							   y + layout.conf.containerActivityEmptyHeight,
-							   layout.colors.optionalActivity);
+							   layout.colors.optionalActivity, layout.colors.optionalActivityBorder, 0.5);
 		}
 		
 		if (!isReadOnlyMode){
@@ -567,12 +567,12 @@
 			this.drawContainer(x, y,
 							  box.x2 + layout.conf.containerActivityPadding,
 							  box.y2 + layout.conf.containerActivityPadding,
-							  layout.colors.optionalActivity);
+							  layout.colors.optionalActivity, layout.colors.optionalActivityBorder, 0.5);
 		} else {
 			this.drawContainer(x, y,
 							   x + layout.conf.containerActivityEmptyWidth,
 							   y + layout.conf.containerActivityEmptyHeight,
-							   layout.colors.optionalActivity);
+							   layout.colors.optionalActivity, layout.colors.optionalActivityBorder, 0.5);
 		}
 		
 		if (this.grouping) {
@@ -806,15 +806,17 @@
 		// do not draw twice if it already exists
 		if (!activity.items.groupingEffect) {
 			var shape = activity.items.shape,
-				activityBox = activity.items.getBBox();
-			
+				activityBox = activity.items.getBBox(),
+				activityBorderColor = layout.colors.toolActivityBorder[layout.toolMetadata[activity.learningLibraryID].activityCategoryID];
+
 			activity.items.groupingEffect = paper.rect(
 					activityBox.x + layout.conf.groupingEffectPadding,
 					activityBox.y + layout.conf.groupingEffectPadding,
 					activityBox.width,
 					activityBox.height)
 				.attr({
-					'stroke' : layout.colors.activityBorder,
+					'stroke' : activityBorderColor,
+				    'stroke-width' : '0.5',
 					'fill' : shape.attr('fill')
 				});
 			
Index: lams_central/web/includes/javascript/authoring/authoringDecoration.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringDecoration.js,v
diff -u -r1.11.2.4 -r1.11.2.5
--- lams_central/web/includes/javascript/authoring/authoringDecoration.js	25 Apr 2016 09:56:57 -0000	1.11.2.4
+++ lams_central/web/includes/javascript/authoring/authoringDecoration.js	16 Nov 2016 13:06:04 -0000	1.11.2.5
@@ -1,4 +1,4 @@
-/**
+/**
  * This file contains methods for Decoration (annotations, containers) manipulation on canvas.
  */
 
@@ -61,7 +61,7 @@
 	methods : {
 		container : {
 			
-			draw : function(x, y, x2, y2, color){
+			draw : function(x, y, x2, y2, color, borderColor, strokeWidth){
 				// 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,
@@ -96,6 +96,11 @@
 					x2 = Math.max(x2, label.getBBox().x2 + 5);
 				}
 				
+				if ( ! borderColor )
+					borderColor = layout.colors.activityBorder;
+				if ( ! strokeWidth )
+					strokeWidth = 1;
+				
 				// the rectangle
 				this.items.shape = paper.path(Snap.format('M {x} {y} h {width} v {height} h -{width} z',
 														  {
@@ -105,7 +110,8 @@
 														   'height'    : y2 - y
 														  }))
 						 			    .attr({
-						 			    	'stroke' : layout.colors.activityBorder,
+						 			    	'stroke' : borderColor,
+										    'stroke-width' : strokeWidth,
 						 			    	'fill'   : color
 						 			    });
 				this.items.prepend(this.items.shape);
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v
diff -u -r1.51.2.49 -r1.51.2.50
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	15 Nov 2016 22:35:28 -0000	1.51.2.49
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	16 Nov 2016 13:06:04 -0000	1.51.2.50
@@ -1,4 +1,4 @@
-/**
+/**
  * This file contains main methods for Authoring.
  */
 
@@ -95,9 +95,9 @@
 		
 		'colors' : {
 			'activityBorder'	  : 'black',
-			'toolActivityBorder'      : ['','#808699','#ff0000','#625F67','#ffa500','#808080','#7aa712'],
+			'toolActivityBorder'      : ['','#00007f','#ff8300','#625F67','#ffa500','#00007f','#7aa712'],
 			// each activity type has its own colour
-			'activity'     		  : ['','#d0defd','#fffccb','#ece9f7','#fdf1d3','#ffffff','#e9f9c0'],
+			'activity'     		  : ['','#caddfb','#ffffbb','#ece9f7','#fdf1d3','#caddfb','#e9f9c0'],
 			'activityText' 		  : 'black',
 			// default region colour
 			'annotation'		  : '#FFFF00',
@@ -116,9 +116,10 @@
 			'gate'         		  : 'red',
                         'gateBorder'              : '#801515',
 			'gateText'     		  : 'white',
-			'grouping'		  : '#A9C8FD',
-			'groupingBorder'	  : '#485067',
-			'optionalActivity'    : 'rgb(194,213,254)',
+			'grouping'		  : '#caddfb',
+			'groupingBorder'	  : '#00007f',
+			'optionalActivity'    : '#caddfb',
+			'optionalActivityBorder'    : '#00007f',
 			// dashed border around a selected activity 
 			'selectEffect'        : 'black',
 			'transition'   		  : 'rgb(119,126,157)'