Updated grdle files and scopes