Theming extension fix