Changed settings storage to a single dictionary