Couple more fixes
Fix theme updating