Optimize scripts

Made a few optimizations to scripts.

Note that most of these are untested as I don't have the programs set up to test these properly, so some testers would be nice.

This may also cause a merge conflict with another patch as I've been modifying a similar file so that will need to be dealt with.

My next merge request will be yet more work with the configuration to deprecate some older variables that are no longer needed anymore.

Major clean up needs to be done before wayland support is more tightly integrated.