CLI themes improvements