Fix themes 3
Fix theme 4