themeing and adding comments