Unify dark/light detection
Reorganize .vimrc