Merged emerge definitions into main
Tidied up update_file.rb