Update stages of 'special' staged badges (and add water one)