merge original and calm menus. new css classes have been defined to allow some entities to show/hide depending on the selected theme.
use class="selectable_theme theme_XXX" to display only in theme XXX.