Task #8 Fixed theme