Do a huge settings mess

Change-Id: I8b9d5c4b7daa57af72f59848fc4cbcb21e747f05