Resources

These are all the changes to add all the new keys, and make it all work in docsun. Sorry about all the small commits, I cant squash them at the moment.