Improve module/theme support, with nav support