Merged section en normal component to theme component. Improved styles in theme