Improved theme context.