Modified output of theme menus - Closes issue #16