That is one option. Will see if I can make it configurable and/or dependent on the theme.