updated upstream, with theme tweaks for navigation