Merge "Additional caption settings for edge styles and window color"