@MrDuartePT I've left a comment about your changes to onedrive that you've left unanswered. Let's keep the conversation going here since it would be easier to manage.
I'm suggesting that you first fix the errors that prevent the packages from being merged (like the manifest failure, incorrect deps and keywords) and then go and through and apply the style changes.