[1.10] Flood it!

An updated version of my first ever command block creation!
Flood it! Is a single-player board game which consists of a grid of 6 randomly arranged colors. Groups of blocks of the same color is considered a single piece, and you can change the color of the piece connected to the top left corner. Through this mechanic, you must reduce the board into a single piece; However, you only have 25 moves to work with.

This version can be installed anywhere via structure blocks (Included in world download)
Compared to my old version, this one generats a board instantly.
And the previously 2 chunks used is now reduced to one chunk, and only 4 blocks flat! (Technically 6)
A colorblind-friendly palette is featured.

My best solve is 21 moves. (4 moves remaining) Can you beat that?