updated patches for current upstream version; added colorscheme