Sprint 1 - theme changes