Replace themechooser with TS variant