Bug4229/motion

This is a clean-up of the patch I had previously submitted on Bugzilla - more cleaning and more color props. Still needs a second party to review!