New option to support theme