more theming & messages logic