No, please put all your button code in a function, like 'readButton()'. Also you used a blocking 'delay(20)'. I told you not to use blocking code.
Also, it seems like you're leaning back on the blocking effect routines (colorWipe...) from the original example. I thought I explained clearly that those can not run without extensive re-writes.
In any case, you have to ensure that any effects code that you use, is non-blocking.