Re-fix theme