Making the theme more perfect