incorporating changes from latest theme