Change loading order of files; more link attribute renaming