Added theme options and a couple of other changes