improve whole theme