changed to reflect theme better