theme settings

Change-Id: I2cc9218d30fced5bc84626d91923951bdb06d3e3
Merge remote-tracking branch 'DarkCM/cm-10.1' into cm-10.1