#571 - Misc theming.