Support for different control shapes
Merge from CWG to get new assets
Added rotation to the control shape detection
Added rotation to the control shape detection