Bug fixes for CSS and Template restore. Works under 1.6.