Fix Settings FC on boot / Moved themes