Add new chart options from david-cys fork