Update Metrolook

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

* Some cleaning up.

Change-Id: Id8d7d4a054d0f1ada65968826a481ea9d26f91e6