theme change. Fixed navbar active logic