Issue #2141119 by kim.pepper: Let themes add classes they need