Rebuild navtree marker implementation
Merge theme