Adding theming
Adding some comments in translation