Tidied up all.yml and basics.yml.