Removed custom line number colors, colorscheme ones are fine
Merge branch 'master' into scala