Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -rcbbfa7b4f1376a67021e8583da40eca2b082a40e -ra7909af6ef577f3117f321c56e44b952161fd11e
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision cbbfa7b4f1376a67021e8583da40eca2b082a40e)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision a7909af6ef577f3117f321c56e44b952161fd11e)
@@ -44,10 +44,10 @@
   
 	public static var TOOL_ACTIVITY_WIDTH:Number = 123.1;
 	public static var TOOL_ACTIVITY_HEIGHT:Number = 50.5;
-	public static var GATE_ACTIVITY_HEIGHT:Number =30;
-	public static var GATE_ACTIVITY_WIDTH:Number = 30;
-	public static var ICON_WIDTH:Number = 30;
-	public static var ICON_HEIGHT:Number = 30;
+	public static var GATE_ACTIVITY_HEIGHT:Number =28;
+	public static var GATE_ACTIVITY_WIDTH:Number = 28;
+	public static var ICON_WIDTH:Number = 25;
+	public static var ICON_HEIGHT:Number = 25;
 	
 	//this is set by the init object
 	private var _canvasController:CanvasController;
@@ -234,7 +234,7 @@
 	
 	private function setUpActIcon(icon_mc):Void{
 		icon_mc._x = (CanvasActivity.TOOL_ACTIVITY_WIDTH / 2) - (icon_mc._width / 2);
-		icon_mc._y = (CanvasActivity.TOOL_ACTIVITY_HEIGHT / 2) - (icon_mc._height / 2) - 5;
+		icon_mc._y = (CanvasActivity.TOOL_ACTIVITY_HEIGHT / 2) - (icon_mc._height / 2) - 6;
 	}
 	
 	/**
@@ -501,6 +501,35 @@
 	
 	public function setActivity(a:Activity){
 		_activity = a;
+	}
+	
+	
+	private function getAssociatedStyle():Object{
+		trace("Category ID for Activity "+_activity.title +": "+_activity.activityCategoryID)
+		var styleObj:Object = new Object();
+		switch (String(_activity.activityCategoryID)){
+			case '0' :
+				styleObj = _tm.getStyleObject('ACTPanel0')
+                break;
+            case '1' :
+			    styleObj = _tm.getStyleObject('ACTPanel1')
+                break;
+			case '2' :
+				styleObj = _tm.getStyleObject('ACTPanel2')
+				break;
+			case '3' :
+				styleObj = _tm.getStyleObject('ACTPanel3')
+				break;
+			case '4' :
+				styleObj = _tm.getStyleObject('ACTPanel4')
+				break;
+			case '5' :
+				styleObj = _tm.getStyleObject('ACTPanel5')
+				break;
+            default :
+                styleObj = _tm.getStyleObject('ACTPanel0')
+		}
+		return styleObj;
 	}
 
 
@@ -510,20 +539,22 @@
 	 * @usage   
 	 * @return  
 	 */
+	 
+	
 	private function setStyles() {
 		var my_color:Color = new Color(this);
 		var styleObj;
 		
 		var transNegative = {ra:-100, ga:-100, ba:-100, rb:255, gb:255, bb:255};
 		var transPositive = {ra:100, ga:100, ba:100, rb:0, gb:0, bb:0};
-		title_lbl.setStyle('textAlign', 'center');
+		styleObj = _tm.getStyleObject('CALabel');
+		title_lbl.setStyle('styleName',styleObj);
 		if (bgNegative == "true"){
 			my_color.setTransform(transNegative);
 		}else if(bgNegative == "false"){
 			my_color.setTransform(transPositive);
 		}else if(bgNegative == "original"){
-			styleObj = _tm.getStyleObject('label');
-			title_lbl.setStyle('styleName',styleObj);
+			
 			if (this.activity.parentUIID != null || this.activity.parentUIID != undefined){
 				if (_module != "monitoring"){
 					var parentAct = _canvasModel.getCanvas().ddm.getActivityByUIID(this.activity.parentUIID)
@@ -535,11 +566,12 @@
 					styleObj = _tm.getStyleObject('OptActPanel')
 					act_pnl.setStyle('styleName',styleObj);
 				}else {
-					styleObj = _tm.getStyleObject('ACTPanel')
+					
+					styleObj = getAssociatedStyle()	//_tm.getStyleObject('ACTPanel')
 					act_pnl.setStyle('styleName',styleObj);
 				}
 			}else {
-					styleObj = _tm.getStyleObject('ACTPanel')
+					styleObj = getAssociatedStyle()	//_tm.getStyleObject('ACTPanel')
 					act_pnl.setStyle('styleName',styleObj);
 				}
 			
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -ra7909af6ef577f3117f321c56e44b952161fd11e
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 735adeb5d2ea7849b86d4991480630c4613fadec)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision a7909af6ef577f3117f321c56e44b952161fd11e)
@@ -98,6 +98,7 @@
 		_visibleHeight = container_pnl._height;
 		_visibleWidth = container_pnl._width;
 		_ca = new ComplexActivity(_activity.activityUIID)
+		_activity.activityCategoryID = Activity.CATEGORY_SYSTEM
 		//_activity.title = Dictionary.getValue('opt_activity_title')
 		//init();
 		MovieClipUtils.doLater (Proxy.create (this, init));
@@ -309,14 +310,44 @@
 	public function get getpanelHeight():Number {
 		return panelHeight;
 	}
+	
+	private function getAssociatedStyle():Object{
+		trace("Category ID for Activity "+_activity.title +": "+_activity.activityCategoryID)
+		var styleObj:Object = new Object();
+		switch (String(_activity.activityCategoryID)){
+			case '0' :
+				styleObj = _tm.getStyleObject('ACTPanel0')
+                break;
+            case '1' :
+			    styleObj = _tm.getStyleObject('ACTPanel1')
+                break;
+			case '2' :
+				styleObj = _tm.getStyleObject('ACTPanel2')
+				break;
+			case '3' :
+				styleObj = _tm.getStyleObject('ACTPanel3')
+				break;
+			case '4' :
+				styleObj = _tm.getStyleObject('ACTPanel4')
+				break;
+			case '5' :
+				styleObj = _tm.getStyleObject('ACTPanel5')
+				break;
+            default :
+                styleObj = _tm.getStyleObject('ACTPanel0')
+		}
+		return styleObj;
+	}
+	
 	private function setStyles():Void {
 		var styleObj = _tm.getStyleObject ('label');
 		title_lbl.setStyle (styleObj);
-		styleObj = _tm.getStyleObject ('smlLabel');
+		styleObj = _tm.getStyleObject ('PIlabel');
 		actCount_lbl.setStyle ('styleName', styleObj);
-		styleObj = _tm.getStyleObject ('OptHeadPanel');
-		header_pnl.setStyle ('styleName', styleObj);
-		styleObj = _tm.getStyleObject ('OptActContainerPanel');
+		//styleObj = _tm.getStyleObject ('OptHeadPanel');
+		//header_pnl.setStyle ('styleName', styleObj);
+		//styleObj = _tm.getStyleObject ('OptActContainerPanel');
+		styleObj = getAssociatedStyle();
 		container_pnl.setStyle ('styleName', styleObj);
 	}
 }
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -ra7909af6ef577f3117f321c56e44b952161fd11e
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 735adeb5d2ea7849b86d4991480630c4613fadec)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision a7909af6ef577f3117f321c56e44b952161fd11e)
@@ -51,6 +51,7 @@
 	private var _canvasView:CanvasView;
 	private var _monitorController:MonitorController;
 	private var _monitorTabView : MonitorTabView;
+	private var _tm:ThemeManager;
 	//Set by the init obj
 	private var _activity:Activity;
 	private var _children:Array;
@@ -88,6 +89,7 @@
 	function CanvasParallelActivity(){
 		Debugger.log("_activity:"+_activity.title+'uiID:'+_activity.activityUIID+' children:'+_children.length,Debugger.GEN,'Constructor','CanvasParallelActivity');
 		_visible = false;
+		_tm = ThemeManager.getInstance();
 		_ddm = new DesignDataModel()
 		_visibleHeight = container_pnl._height;
 		_visibleWidth = container_pnl._width;
@@ -167,18 +169,46 @@
 		_activity = a;
 	}
 	
+	
+	private function getAssociatedStyle():Object{
+		trace("Category ID for Activity "+_activity.title +": "+_activity.activityCategoryID)
+		var styleObj:Object = new Object();
+		switch (String(_activity.activityCategoryID)){
+			case '0' :
+				styleObj = _tm.getStyleObject('ACTPanel0')
+                break;
+            case '1' :
+			    styleObj = _tm.getStyleObject('ACTPanel1')
+                break;
+			case '2' :
+				styleObj = _tm.getStyleObject('ACTPanel2')
+				break;
+			case '3' :
+				styleObj = _tm.getStyleObject('ACTPanel3')
+				break;
+			case '4' :
+				styleObj = _tm.getStyleObject('ACTPanel4')
+				break;
+			case '5' :
+				styleObj = _tm.getStyleObject('ACTPanel5')
+				break;
+            default :
+                styleObj = _tm.getStyleObject('ACTPanel0')
+		}
+		return styleObj;
+	}
+	
+	
 	private function draw(){
 			
 		//write text
 		title_lbl.text = _activity.title;
-		actCount_lbl.text = _children.length+ Dictionary.getValue('lbl_num_activities'); //" activities";
+		//actCount_lbl.text = _children.length+ Dictionary.getValue('lbl_num_activities'); //" activities";
 		
 //			_global.breakpoint();
 		
-		header_pnl.borderType='outset';
-		container_pnl.setStyle("backgroundColor",0x4289FF);
-		
-		
+		//header_pnl.borderType='outset';
+			
 		if(fromModuleTab == "monitorMonitorTab"){
 			var mm:MonitorModel = MonitorModel(_monitorController.getModel());
 		trace("all learner progress length in Canvas activity: "+mm.allLearnersProgress.length);
@@ -212,11 +242,22 @@
 		_y = _activity.yCoord
 	
 		setLocking()
+		setStyles()
 		_visible = true;
 		//child1_mc._visible = true;
 					
 	}
 	
+	private function setStyles():Void {
+		var styleObj = _tm.getStyleObject ('label');
+		title_lbl.setStyle (styleObj);
+		styleObj = getAssociatedStyle();
+		container_pnl.setStyle('styleName',styleObj);
+		styleObj = _tm.getStyleObject ('OptHeadPanel');
+		header_pnl.setStyle('styleName',styleObj);
+		//container_pnl.setStyle("backgroundColor",0x4289FF);
+	}
+	
 	private function setLocking():Void{
 		if(_locked){
 			padlockClosed_mc._visible = true;