Fixed Shape matching and added color border extraction