Started to reskin world map but not complete