The old logic threw away the result of updateSettings
by applying the styles saved and modified after calling
it, which lost all the custom colors thereby breaking
custom-widgets and themeing altogether.

Change-Id: Ic3750f145b67cd6a379f3b628a10c213a31656e7