Typo fix in lib Template
Update lib Message to use new theme-location