City staff propose five themes for new 25-year official plan