Feature/stabilize rotation and touching

There are problems with the default :preferences strategy.