Really remove themechooser

Change-Id: Ief732b2e191a85da1126361bc903568dcd3c0635