Theme Engine: Fix SystemUI FC when applying new theme
Includes a few other adjustments as well