Add some new colors
Merge branch 'master' into edge
Add some new colors
Use closepopup instead of smart
Merge branch 'master' into edge
Use closepopup instead of smart
Use new colorscheme
Use new colorscheme
Merge branch 'master' into edge