Small (but important) improvement to some themes