Hi, Previously we were checking for includeForm in the page's content to decide to use inline mode automatically. Since this have been replaced by the {{include}} macro we have 2 choices I think: 1a) Add a new {{includeForm}} macro that does the same as include but that'll be able to check to decide if we use automatic inline mode 1b) Create a new {{editMode default="view|inline|..."/}} macro used as a marker only to decide what mode to use by default. 2) Add some metadata to the page, like a default edit mode that can set to "wiki", "inline", "wysiwyg", "objects", "class", etc. This mode would be a combo box that you can change in edit mode. 3) Do something more complex like define a page type. One type could be "Form". It's possible 3) is related to the "Easy creation of structured pages" but I don't know enough to see how closely related they are. My take is that in 1) (a or b) is best in the short term while we think more about how we want to do this cleanly. WDYT? Thanks -Vincent