Sprint 2 - theme changes