Some minor changes to support external theming.