More improvements
- Fix color in figure and table captions;
Update template file