In-progress theme and nav fixing