I've pushed Pavel's changes to my repo. The branch is bbq-tabs-modal In order to get it to build, you need to modify Makefile.am. I pushed a commit for that: you should be able to get it with: git fetch admiyo git cherry-pick a9b3b5aaeeb82222a8ab7ade02bba9feb4051987