App.Light.Text refactoring