fix menus bug, add support for {{site-dir}} for themes