Fix for caption error, coloring flat buttons