Add necessary changes for kanged theme chooser changes.

Signed-off-by: travp624 <travp624@gmail.com>