Reorganized using latest solarized scheme