Added new theme
Removed usage of Language
Templates