Hi Mike & Uli, As Mike suggested, I redone all changes (plus even some more bonus items). Since I was in a separate git branch I could run the format-patch easily via:git format-patch master. Thanks for the suggestion. @Uli I'm using the auto-formatter for C++ built-in in VS Code. I think the end-result with all the separate patches makes more sense now, sorry I didn't do it right away. I think once I have a wiki account, I will add all these best practices your x2go wiki. Instead of Attachment: : https://wiki.x2go.org/doku.php/wiki:bugs?s[]=git&s[]=patch#bug_submission_with_a_patch. See the attachments for all the patches in this mail (11 in total). Thanks in advance. Best regards, Melroy van den Berg