Change hybrid color name to hybrid-mod
Readd hybrid colorscheme
Rename hybrid to hybrid-mod
More cleanup