Fixed a problem with the localization XPath
Added two new base theme templates