Added code for initial config and handling for non-existant themes