Working on the light theme