Theme chooser Revolution 2/2

Change-Id: I8f79ed5199ea408812e1d8cc14a81735e3884004