diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index b560793..afda8b5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -372,7 +372,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             $rootScope.shapeSize = parseInt(btnBrushSizeValue);
             $("#annotationpaintbrushsize").attr("data-size", $rootScope.shapeSize);
 
-            $("#annotationpaintbrushsize").attr("data-color", $rootScope.shapestyleFillColor);
+            $("#annotationpaintbrushsize").attr("data-color", $rootScope.shapestyleColorWithOpacity);
 
 
 
@@ -475,6 +475,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
                 $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
                 $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
+                $rootScope.shapeStyleColorRGBA = $rootScope.shapestyleFillColor.replace("rgb", "rgba");
+                $rootScope.shapestyleColorWithOpacity = $rootScope.shapeStyleColorRGBA.substring(0, $rootScope.shapeStyleColorRGBA.length - 1) + " " + "," + $rootScope.shapestyleOpacity + ")";
                 $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
                 $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
            // $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);