Nightmode cleanup v2

9 less !importants + misc changes