theme output simplification