fix some theme entry bugs