changed layout to theme.

Related to #385.