improve theme metrics