Fixing button and nav theme double-dipping