diff --git a/xep-0155.xml b/xep-0155.xml
index 62da6f45..b2d62701 100644
--- a/xep-0155.xml
+++ b/xep-0155.xml
@@ -194,13 +194,13 @@ PENDING  o---------------+
         <value>true</value>
         <required/>
       </field>
-      <field label='Off-The-Record?' type='list-single' var='otr'>
-        <value>no</value>
+      <field label='Message logging' type='list-single' var='otr'>
+        <value>mustnot</value>
         <option label='Allow message logging'>
-          <value>no</value>
+          <value>may</value>
         </option>
-        <option label='Disable all message logging'>
-          <value>yes</value>
+        <option label='Disallow all message logging'>
+          <value>mustnot</value>
         </option>
         <required/>
       </field>
@@ -217,26 +217,26 @@ PENDING  o---------------+
         </option>
         <required/>
       </field>
-      <field label='XHTML formatting?'
+      <field label='XHTML formatting'
              type='list-single'
              var='http://jabber.org/protocol/xhtml-im'>
-        <value>yes</value>
-        <option label='Disable'><value>no</value></option>
-        <option label='Enable'><value>yes</value></option>
+        <value>may</value>
+        <option label='Allow XHTML formatting'><value>may</value></option>
+        <option label='Disallow XHTML formatting'><value>mustnot</value></option>
       </field>
       <field label='Temporarily share presence?'
              type='list-single'
              var='presence'
-        <value>yes</value>
-        <option label='Disable'><value>no</value></option>
-        <option label='Enable'><value>yes</value></option>
+        <value>may</value>
+        <option label='Allow temporary presence sharing'><value>may</value></option>
+        <option label='Disallow temporary presence sharing'><value>mustnot</value></option>
       </field>
-      <field label='Chat State Notifications?'
+      <field label='Chat State Notifications'
              type='list-single'
              var='http://jabber.org/protocol/chatstates'>
-        <value>yes</value>
-        <option label='Disable'><value>no</value></option>
-        <option label='Enable'><value>yes</value></option>
+        <value>may</value>
+        <option label='Allow Chat State Notifications'><value>may</value></option>
+        <option label='Disallow Chat State Notifications'><value>mustnot</value></option>
       </field>
       <field label='Minimum security level'
              type='list-single'
@@ -466,10 +466,10 @@ PENDING  o---------------+
         <value>1</value>
         <required/>
       </field>
-      <field label='Off-The-Record?' type='list-single' var='otr'>
-        <value>yes</value>
-        <option label='Disable all message logging'>
-          <value>yes</value>
+      <field label='Message logging' type='list-single' var='otr'>
+        <value>mustnot</value>
+        <option label='Disallow all message logging'>
+          <value>mustnot</value>
         </option>
         <required/>
       </field>
@@ -645,22 +645,22 @@ PENDING  o---------------+
       var='http://jabber.org/protocol/chatstates'
       type='list-single'
       label='Whether may send Chat State Notifications per XEP-0085'>
-    <option label='Must Not Send'>
-      <value>no</value>
-    </option>
     <option label='May Send'>
-      <value>1</value>
+      <value>may</value>
+    </option>
+    <option label='Must Not Send'>
+      <value>mustnot</value>
     </option>
   </field>
   <field
       var='http://jabber.org/protocol/xhtml-im'
       type='list-single'
       label='Whether allowed to use XHTML-IM formatting per XEP-0071'>
-    <option label='Must Not Send'>
-      <value>no</value>
-    </option>
     <option label='May Send'>
-      <value>1</value>
+      <value>may</value>
+    </option>
+    <option label='Must Not Send'>
+      <value>mustnot</value>
     </option>
   </field>
   <field
@@ -672,14 +672,16 @@ PENDING  o---------------+
   <field
       var='otr'
       type='list-single'
-      label='Off-The-Record'>
-    <option label='May log messages'>
-      <value>no</value>
+      label='Whether allowed to log messages (i.e., 
+             whether Off-The-Record mode is required)'>
+    <option label='May Log Messages'>
+      <value>may</value>
     </option>
-    <option label='Must disable absolutely all message
+    <option label='Must Not Log Messages (i.e., must 
+                   disable absolutely all message
                    logging including automatic archiving
                    -- see XEP-0136'>
-      <value>1</value>
+      <value>mustnot</value>
     </option>
   </field>
   <field