Reorganized styles, put search options in the right place
Merge remote-tracking branch 'origin/master'
try consolas before FreeMono