Fix several errors and git colorscheme working again