going to fix a bug about text on top of image
Merge branch 'theme'