fix for maps, add back swype theme