Security fixes for themes