Switching theme and map bug fixed