Added theme option