restructuring tmLanguage as well as tmTheme