Move to default class name and fix theme support