fix some theme entry bugs#CannedFish