Build 404 pages from the theme if they exist

Rather than nest these would it be clearer if code using them calls each separately and combines the two dicts?
Maybe cleaner to have that done at the top level, rather than nested in here?