- Patch #9657: more intelligent theme() function. Hopefully, Adrian will be able to use this patch too.