Theme Chooser Update WIP DO NOT BUILD