Block color theme change fix