Issue #810: Apply CSS classes