use cat and hat for theming; remove theme-aware