indi-blocks-fixes
comment color fixes
Merge branch 'dev'