Added support for themes and new item highlighting.