Self Actions Colors + Water fixes