Move layout into DanceSurface and convert colours