Changed content objects definitions

Because they now named like normal content cols e.g. content_left,
content_right, content_border