rework overall theme