Conver theme to fluid

Conver theme to fluid