Experimental removal of theming call