Rearranging menu and adding new theme