Reworked theme