Theme filters are highlighted mostly correctly when selected