Improve organization of colorscheme definitions + add/configure vim-bookmarks