Rebase vendor folder of Tbalden

A lot of stuff to fix...