diff --git a/xep-0155.xml b/xep-0155.xml
index 9c9ec40a..e2e2d47d 100644
--- a/xep-0155.xml
+++ b/xep-0155.xml
@@ -129,28 +129,28 @@
         <required/>
       </field>
       <field label='Off-The-Record?' type='list-single' var='otr'>
-        <value>false</value>
+        <value>0</value>
         <option label='Allow message logging'>
-          <value>false</value>
+          <value>0</value>
         </option>
         <option label='Disable all message logging'>
-          <value>true</value>
+          <value>1</value>
         </option>
         <required/>
       </field>
       <field label='XHTML Formatting?'
              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>
+        <value>1</value>
+        <option label='Disable'><value>0</value></option>
+        <option label='Enable'><value>1</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>
+        <value>1</value>
+        <option label='Disable'><value>0</value></option>
+        <option label='Enable'><value>1</value></option>
       </field>
       <field label='Minimum security level'
              type='list-single'
@@ -193,12 +193,12 @@
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
       <field var='accept'><value>true</value></field>
-      <field var='otr'><value>false</value></field>
+      <field var='otr'><value>0</value></field>
       <field var='http://jabber.org/protocol/xhtml-im'>
-        <value>false</value>
+        <value>0</value>
       </field>
       <field var='http://jabber.org/protocol/chatstates'>
-        <value>false</value>
+        <value>0</value>
       </field>
       <field var='security'><value>c2s</value></field>
       <field var='language'><value>it</value></field>
@@ -304,12 +304,12 @@
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
       <field var='accept'><value>true</value></field>
-      <field var='otr'><value>false</value></field>
+      <field var='otr'><value>0</value></field>
       <field var='http://jabber.org/protocol/xhtml-im'>
-        <value>false</value>
+        <value>0</value>
       </field>
       <field var='http://jabber.org/protocol/chatstates'>
-        <value>false</value>
+        <value>0</value>
       </field>
       <field var='security'><value>c2s</value></field>
       <field var='language'><value>it</value></field>
@@ -390,9 +390,9 @@
         <required/>
       </field>
       <field label='Off-The-Record?' type='list-single' var='otr'>
-        <value>true</value>
+        <value>1</value>
         <option label='Disable all message logging'>
-          <value>true</value>
+          <value>1</value>
         </option>
         <required/>
       </field>
@@ -412,7 +412,7 @@
         <value>http://jabber.org/protocol/chatneg</value>
       </field>
       <field var='accept'><value>1</value></field>
-      <field var='otr'><value>true</value></field>
+      <field var='otr'><value>1</value></field>
     </x>
   </feature>
 </message>
@@ -537,23 +537,23 @@
   <field
       var='http://jabber.org/protocol/chatstates'
       type='list-single'
-      label='Whether to enable Chat State Notifications per XEP-0085'>
-    <option label='Disable'>
-      <value>false</value>
+      label='Whether must send Chat State Notifications per XEP-0085'>
+    <option label='May Send'>
+      <value>0</value>
     </option>
-    <option label='Enable'>
-      <value>true</value>
+    <option label='Must Send'>
+      <value>1</value>
     </option>
   </field>
   <field
       var='http://jabber.org/protocol/xhtml-im'
       type='list-single'
-      label='Whether to enable XHTML-IM formatting per XEP-0071'/>
-    <option label='Disable'>
-      <value>false</value>
+      label='Whether allowed to use XHTML-IM formatting per XEP-0071'/>
+    <option label='Must Not Send'>
+      <value>0</value>
     </option>
-    <option label='Enable'>
-      <value>true</value>
+    <option label='May Send'>
+      <value>1</value>
     </option>
   </field>
   <field
@@ -566,13 +566,13 @@
       var='otr'
       type='list-single'
       label='Off-The-Record'>
-    <option label='Allow message logging'>
-      <value>false</value>
+    <option label='May log messages'>
+      <value>0</value>
     </option>
-    <option label='Disable absolutely all message logging
-                   including automatic archiving - see
-                   XEP-0136'>
-      <value>true</value>
+    <option label='Must disable absolutely all message
+                   logging including automatic archiving
+                   - see XEP-0136'>
+      <value>1</value>
     </option>
   </field>
   <field