Remove Riv, change Unite mapping, change emmet