Theme entity fine tune