Full window mode and updated watermark
Resolved conflicts