Updated colorscheme and added features