Added Main- and Subtitle.

Where will this be merged to?