Revert "Extended QS Options: fix force close...

…on theme changes"