Preferences: display line numbers and highlight current line
Tomorrow and Monokai (real) themes
Cleanup themes
Themes code cleanup
Merge remote-tracking branch 'upstream/master'