Theme functionality made optional