Changed color scheme and some general fixes