Fix up the last bits of theming