More namespace protection
Timeplot refinements: empty-message, move styles into CSS
Cleanup: Remove unused templates from s3 not from s3.xxx