adding theme code, pulled from 5.6.3.1 release