Rework style settings, (1/2):

See settings part for more information

Change-Id: If4454650440b48bcefa40d53f3940d978fb03be4