Simplify to "make color" & "split color" blocks

Thanks to "themadrobot"