Fixed another path issue and an issue with the key and theme selectors.