Add smooth transition mode (wip)