Slightly improved support for coloring in the windows. Needs more work.