Improve support for different admin themes