Added colors + more