Theme should be mostly done finally