Track theme chooser stuff

Change-Id: I7299f5e27f14212f60410cfe57cda94c39332f46
Signed-off-by: iceandfire <arhamjamal@gmail.com>