working on nightmode on redesign