Fix transformation cases trying to grab more in a colored block, renamed a variable