Vim changes and some other theme changes