Added Themes and Advanced Settings

Change-Id: Ibf3fcdd98b32af7093f1d9ed05c29216c3cfeac6
I think these are unnecessary....

Change-Id: I8edecebe774183c8eb4979addc9bb21f2cc27681