Theme reworked.