OwnerInfo: Dark Materialize (all patch)

Also cleanup some stuff, spacing OCD

Change-Id: I8c270d06e1ec7f9f28e7f1bf944e4fce7e516132