Corrected colors and set position-blip  to white
Merged some small issues in RectModel