try to use themes
component bean
Merge remote-tracking branch 'origin/master'