Fix existence tests
Use a colorscheme color for modified filename
Merge branch 'jellybeans' into develop