refactoring chart theme