Theme update

Add support for dynamic nav