Changed colors + improvements