Reworked overall theme