Remove colons everywhere, at least necessary