Improve colorscheme selection
Add swapfile settings