improving theme and implement chapter