Added colorscheme and moved stuff around a bit