diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 0a0a338..1e6994b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -472,9 +472,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
                 $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
                 $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
                 $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
-                $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
+           // $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
                 $rootScope.borderDimensions = $("#" + id).parent().css("border-top-width");
-                $("#shapeStyleDiv").parent().css("border-width", $rootScope.borderDimensions);
+           
+                document.getElementById("shapeStyleDiv").parentNode.style.border = $rootScope.borderDimensions + " " + "solid" + " " + $rootScope.shapestyleborderColor;
+
+           // $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel);
 
                 var borderDimensions = $rootScope.borderDimensions;
                 var borderDimensionSplitArray = borderDimensions.split("p");
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index a8af2e8..2fde181 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -886,7 +886,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button id="btnShapeStyle" type="button" class="btn btn-primary btn-sm" ng-click="shapestyle('imgOpacity')">
+                <button id="btnShapeStyle" type="button" class="btn btn-primary btn-sm" ng-click="setPropertiesForShapes('imgOpacity')">
                     OK
                 </button>
                 <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="disableAnnotationToolBar()">Cancel</button>
@@ -1435,11 +1435,13 @@
                 borderWidth = $(this).val();
 
                 if (borderColor != null) {
-
-                    $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor);
+                    document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor;
+                    //$("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor);
                 } else {
 
-                    $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid");
+                   // $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid");
+                    document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor;
+
                 }
             });
 
@@ -1464,7 +1466,8 @@
                             console.log(value);
 
                             borderColor = value;
-                            $("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor);
+                            //$("#imgOpacity").parent().css("border", borderWidth + "px" + " " + "solid" + borderColor);
+                           document.getElementById("imgOpacity").parentNode.style.border = borderWidth + "px" + " " + "solid" + " " + borderColor;
 
 
                         }