Use new themes
Update layout