Add styleclass names
Merge pull request #2854 from collinss/menu-theme-fix

[2.2] Menu theme fix