Improve organization of chart themes.