misc. fix, improvement of theme