classic template color fix
Merge branch 'next' into pos