Update Metrolook

* Adds some new settings. please see README.md for new settings.

* Some cleaning up.

Change-Id: I2516293315d70844f0ce7e8cd5eb1f7059a98302