Track New Theme Choose UI from CM

See here: https://github.com/PAC-man/pacman/commit/549bba2b19028ea7445109d1884cd5a269fbe268