Misc changes, add hybrid colorscheme