Removed singleton from Settings. Added the base structure to support background rendering. Note that this is still under implementation and not yet available.
Fixed conflicts.