I'll update the PR and ask for a last review as soon as I solve a conflict which popped up in the shared/style/headers.css file after rebasing :-(