clean up, new theme and fullscreen map