Add some new colors
Use closepopup instead of smart
Use new colorscheme