Rebase.
Updated the blocks with the new color design from Ross.