Small theme cleanups