Don't ignore the contents of override blocks when counting characters for selection preserving
Eliminate an extra commit when using the color picker buttons