completed minor adjustments and removing old theme remnants