Fix Theme Chooser & SystemUI FC's