Cleanup
Fix colorscheme issue