Fix
Don't load theme late
tweak