Move messages to theming functions