Update for dm-night layout
Bug fix color in css
Merge changes to be committed