diff --git a/xep-0155.xml b/xep-0155.xml
index c85fd145..b38158fa 100644
--- a/xep-0155.xml
+++ b/xep-0155.xml
@@ -29,7 +29,7 @@
     <version>0.9</version>
     <date>2006-10-05</date>
     <initials>ip</initials>
-    <remark><p>Added language field; replaced secure field with security field; changed otr field to list-single; added not-acceptable error; several clarifications.</p></remark>
+    <remark><p>Added language field; replaced secure field with security field; changed type of otr, XHTML and Chat State fields from boolean to list-single; added not-acceptable error; several clarifications.</p></remark>
   </revision>
   <revision>
     <version>0.8</version>
@@ -111,15 +111,11 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
-      <field label='Accept this chat?'
-             type='boolean'
-             var='accept'>
+      <field label='Accept this chat?' type='boolean' var='accept'>
         <value>true</value>
         <required/>
       </field>
-      <field label='Off-The-Record?'
-             type='list-single'
-             var='otr'>
+      <field label='Off-The-Record?' type='list-single' var='otr'>
         <value>false</value>
         <option label='Allow message logging'>
           <value>false</value>
@@ -132,23 +128,15 @@
              type='list-single'
              var='http://jabber.org/protocol/xhtml-im'>
         <value>true</value>
-        <option label='Disable'>
-          <value>false</value>
-        </option>
-        <option label='Enable'>
-          <value>true</value>
-        </option>
+        <option label='Disable'><value>false</value></option>
+        <option label='Enable'><value>true</value></option>
       </field>
       <field label='Chat State Notifications?'
              type='list-single'
              var='http://jabber.org/protocol/chatstates'>
         <value>true</value>
-        <option label='Disable'>
-          <value>false</value>
-        </option>
-        <option label='Enable'>
-          <value>true</value>
-        </option>
+        <option label='Disable'><value>false</value></option>
+        <option label='Enable'><value>true</value></option>
       </field>
       <field label='Minimum security level'
              type='list-single'
@@ -162,16 +150,10 @@
              type='list-single'
              var='language'>
         <value>en</value>
-        <option label='English'>
-          <value>en</value>
-        </option>
-        <option label='Italiano'>
-          <value>it</value>
-        </option>
+        <option label='English'><value>en</value></option>
+        <option label='Italiano'><value>it</value></option>
       </field>
-      <field label='Reason'
-             type='text-single'
-             var='reason'>
+      <field label='Reason' type='text-single' var='reason'>
         <value>Can we talk?</value>
       </field>
     </x>
@@ -193,24 +175,16 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
-      <field var='accept'>
-        <value>true</value>
-      </field>
-      <field var='otr'>
-        <value>false</value>
-      </field>
+      <field var='accept'><value>true</value></field>
+      <field var='otr'><value>false</value></field>
       <field var='http://jabber.org/protocol/xhtml-im'>
         <value>false</value>
       </field>
       <field var='http://jabber.org/protocol/chatstates'>
         <value>false</value>
       </field>
-      <field var='security'>
-        <value>c2s</value>
-      </field>
-      <field var='language'>
-        <value>it</value>
-      </field>
+      <field var='security'><value>c2s</value></field>
+      <field var='language'><value>it</value></field>
       <field var='reason'>
         <value>OK, but I'm too tired to practice my English!</value>
       </field>
@@ -231,9 +205,7 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
-      <field var='accept'>
-        <value>0</value>
-      </field>
+      <field var='accept'><value>0</value></field>
       <field var='reason'>
         <value>Sorry, can't chat now! How about tonight?</value>
       </field>
@@ -294,17 +266,13 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
-      <field label='Off-The-Record?'
-             type='list-single'
-             var='otr'>
+      <field label='Off-The-Record?' type='list-single' var='otr'>
         <value>true</value>
         <option label='Disable all message logging'>
           <value>true</value>
         </option>
       </field>
-      <field label='Reason'
-             type='text-single'
-             var='reason'>
+      <field label='Reason' type='text-single' var='reason'>
         <value>Lets keep this private!</value>
       </field>
     </x>
@@ -322,9 +290,7 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
-      <field var='otr'>
-        <value>true</value>
-      </field>
+      <field var='otr'><value>true</value></field>
       <field var='reason'>
         <value>Yes, the sys admin might tell our families!</value>
       </field>
@@ -347,14 +313,10 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
-      <field label='New client name'
-             type='text-single'
-             var='continue'>
+      <field label='New client name' type='text-single' var='continue'>
         <value>PDA</value>
       </field>
-      <field label='Reason'
-             type='text-single'
-             var='reason'>
+      <field label='Reason' type='text-single' var='reason'>
         <value>I am leaving the orchard.</value>
       </field>
     </x>
@@ -374,12 +336,8 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
-      <field var='continue'>
-        <value>PDA</value>
-      </field>
-      <field var='reason'>
-        <value>OK, hurry to me.</value>
-      </field>
+      <field var='continue'><value>PDA</value></field>
+      <field var='reason'><value>OK, hurry to me.</value></field>
     </x>
   </feature>
 </message>
@@ -399,12 +357,8 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
-      <field var='terminate'>
-        <value>1</value>
-      </field>
-      <field var='reason'>
-        <value>Gotta go!</value>
-      </field>
+      <field var='terminate'><value>1</value></field>
+      <field var='reason'><value>Gotta go!</value></field>
     </x>
   </feature>
 </message>
@@ -422,9 +376,7 @@
       <field var='FORM_TYPE' type='hidden'>
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
-      <field var='terminate'>
-        <value>1</value>
-      </field>
+      <field var='terminate'><value>1</value></field>
     </x>
   </feature>
 </message>
@@ -535,9 +487,6 @@ However, if the receiving party assumes that the other client will <em>not</em>
     <option label='Both parties must be securely connected to each other'>
       <value>e2e</value>
     </option>
-    <option label='Both parties must be securely connected both to their servers and to each other'>
-      <value>c2sANDe2e</value>
-    </option>
   </field>
   <field
       var='terminate'