Merge new Settings Interface.

The JSON system works fine.
The PDO should not be enabled yet.