Add in more magic to elscreen and clean up other files