Fixed some hardcoded values and made some values use the value-resources
Merge branch 'dev' of https://github.com/simonjrp/ESCAPE into dev