theme implementation cleanups