Add back light theme for dumping, make 1stage better