fine tune ThemeFns