updated theme chooser

Change-Id: I8e2e27828308007600313dd003564159067ebc51