reworking theme