diff --git a/server/documents/behaviors/api.html.eco b/server/documents/behaviors/api.html.eco
index ac487fb204..4a6399dcb7 100755
--- a/server/documents/behaviors/api.html.eco
+++ b/server/documents/behaviors/api.html.eco
@@ -464,8 +464,10 @@ type        : 'UI Behavior'
                 <div class="default text">Gender</div>
                 <i class="dropdown icon"></i>
                 <div class="menu">
-                  <div class="item" data-value="male">Male</div>
                   <div class="item" data-value="female">Female</div>
+                  <div class="item" data-value="male">Male</div>
+                  <div class="item" data-value="non-binary">Non-binary</div>
+                  <div class="item" data-value="not-listed">None of the above</div>
                 </div>
               </div>
             </div>
diff --git a/server/documents/behaviors/form.html.eco b/server/documents/behaviors/form.html.eco
index 0e4d4d3610..69b7bd45f8 100644
--- a/server/documents/behaviors/form.html.eco
+++ b/server/documents/behaviors/form.html.eco
@@ -122,8 +122,10 @@ type        : 'UI Behavior'
             <label>Gender</label>
             <select class="ui dropdown" name="gender">
               <option value="">Gender</option>
-              <option value="male">Male</option>
               <option value="female">Female</option>
+              <option value="male">Male</option>
+              <option value="non-binary">Non-binary</option>
+              <option value="not-listed">None of the above</option>
             </select>
           </div>
         </div>
@@ -623,8 +625,10 @@ type        : 'UI Behavior'
               <div class="default text">Gender</div>
               <i class="dropdown icon"></i>
               <div class="menu">
-                <div class="item" data-value="male">Male</div>
                 <div class="item" data-value="female">Female</div>
+                <div class="item" data-value="male">Male</div>
+                <div class="item" data-value="non-binary">Non-binary</div>
+                <div class="item" data-value="not-listed">None of the above</div>
               </div>
             </div>
           </div>
@@ -683,8 +687,10 @@ type        : 'UI Behavior'
               <div class="default text">Gender</div>
               <i class="dropdown icon"></i>
               <div class="menu">
-                <div class="item" data-value="male">Male</div>
                 <div class="item" data-value="female">Female</div>
+                <div class="item" data-value="male">Male</div>
+                <div class="item" data-value="non-binary">Non-binary</div>
+                <div class="item" data-value="not-listed">None of the above</div>
               </div>
             </div>
           </div>
@@ -770,8 +776,10 @@ type        : 'UI Behavior'
               <div class="default text">Gender</div>
               <i class="dropdown icon"></i>
               <div class="menu">
-                <div class="item" data-value="male">Male</div>
                 <div class="item" data-value="female">Female</div>
+                <div class="item" data-value="male">Male</div>
+                <div class="item" data-value="non-binary">Non-binary</div>
+                <div class="item" data-value="not-listed">None of the above</div>
               </div>
             </div>
           </div>
@@ -839,8 +847,8 @@ type        : 'UI Behavior'
           <label>Dropdown</label>
           <select class="ui dropdown" name="dropdown">
             <option value="">Select</option>
-            <option value="male">Choice 1</option>
-            <option value="female">Choice 2</option>
+            <option value="1">Choice 1</option>
+            <option value="2">Choice 2</option>
           </select>
         </div>
         <div class="inline field">
@@ -1489,8 +1497,10 @@ type        : 'UI Behavior'
               <div class="default text">Gender</div>
               <i class="dropdown icon"></i>
               <div class="menu">
-                <div class="item" data-value="1">Male</div>
-                <div class="item" data-value="0">Female</div>
+                <div class="item" data-value="1">Female</div>
+                <div class="item" data-value="2">Male</div>
+                <div class="item" data-value="3">Non-binary</div>
+                <div class="item" data-value="4">None of the above</div>
               </div>
             </div>
           </div>
@@ -1530,8 +1540,10 @@ type        : 'UI Behavior'
               <div class="default text">Gender</div>
               <i class="dropdown icon"></i>
               <div class="menu">
-                <div class="item" data-value="1">Male</div>
-                <div class="item" data-value="0">Female</div>
+                <div class="item" data-value="1">Female</div>
+                <div class="item" data-value="2">Male</div>
+                <div class="item" data-value="3">Non-binary</div>
+                <div class="item" data-value="4">None of the above</div>
               </div>
             </div>
           </div>
diff --git a/server/documents/collections/form.html.eco b/server/documents/collections/form.html.eco
index a40e845c08..ef612b6e1a 100755
--- a/server/documents/collections/form.html.eco
+++ b/server/documents/collections/form.html.eco
@@ -404,8 +404,10 @@ themes      : ['Default', 'Flat', 'Chubby', 'GitHub']
               <i class="dropdown icon"></i>
               <div class="default text">Gender</div>
               <div class="menu">
-                  <div class="item" data-value="1">Male</div>
-                  <div class="item" data-value="0">Female</div>
+                  <div class="item" data-value="1">Female</div>
+                  <div class="item" data-value="2">Male</div>
+                  <div class="item" data-value="3">Non-binary</div>
+                  <div class="item" data-value="4">None of the above</div>
               </div>
           </div>
       </div>
@@ -940,8 +942,10 @@ themes      : ['Default', 'Flat', 'Chubby', 'GitHub']
       <div class="field">
         <select>
           <option value="">Gender</option>
-          <option value="1">Male</option>
-          <option value="0">Female</option>
+          <option value="1">Female</option>
+          <option value="2">Male</option>
+          <option value="3">Non-binary</option>
+          <option value="4">None of the above</option>
         </select>
       </div>
     </div>
@@ -1053,8 +1057,10 @@ themes      : ['Default', 'Flat', 'Chubby', 'GitHub']
           <i class="dropdown icon"></i>
           <input type="hidden" name="gender">
           <div class="menu">
-            <div class="item" data-value="male">Male</div>
             <div class="item" data-value="female">Female</div>
+            <div class="item" data-value="male">Male</div>
+            <div class="item" data-value="non-binary">Non-binary</div>
+            <div class="item" data-value="not-listed">None of the above</div>
           </div>
         </div>
       </div>
diff --git a/server/documents/collections/table.html.eco b/server/documents/collections/table.html.eco
index 27feab4f88..8e7054e564 100755
--- a/server/documents/collections/table.html.eco
+++ b/server/documents/collections/table.html.eco
@@ -36,13 +36,13 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td data-label="Name">James</td>
-          <td data-label="Age">24</td>
+          <td data-label="Name">Jill</td>
+          <td data-label="Age">26</td>
           <td data-label="Job">Engineer</td>
         </tr>
         <tr>
-          <td data-label="Name">Jill</td>
-          <td data-label="Age">26</td>
+          <td data-label="Name">James</td>
+          <td data-label="Age">24</td>
           <td data-label="Job">Engineer</td>
         </tr>
         <tr>
@@ -157,7 +157,7 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
               <img src="/images/avatar2/small/lindsay.png" class="ui mini rounded image">
               <div class="content">
                 Lindsay
-                <div class="sub header">Entertainment
+                <div class="sub header">Executive
               </div>
             </div>
           </td>
@@ -171,7 +171,7 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
               <img src="/images/avatar2/small/mark.png" class="ui mini rounded image">
               <div class="content">
                 Mark
-                <div class="sub header">Executive
+                <div class="sub header">Entertainment
               </div>
             </div>
           </td>
@@ -270,7 +270,7 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
               <input type="checkbox"> <label></label>
             </div>
           </td>
-          <td>John Lilki</td>
+          <td>Jude Lilki</td>
           <td>September 14, 2013</td>
           <td>jhlilk22@yahoo.com</td>
           <td>No</td>
@@ -281,9 +281,9 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
               <input type="checkbox"> <label></label>
             </div>
           </td>
-          <td>Jamie Harington</td>
-          <td>January 11, 2014</td>
-          <td>jamieharingonton@yahoo.com</td>
+          <td>Jill Lewis</td>
+          <td>May 11, 2014</td>
+          <td>jilsewris22@yahoo.com</td>
           <td>Yes</td>
         </tr>
         <tr>
@@ -292,9 +292,9 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
               <input type="checkbox"> <label></label>
             </div>
           </td>
-          <td>Jill Lewis</td>
-          <td>May 11, 2014</td>
-          <td>jilsewris22@yahoo.com</td>
+          <td>Jamie Harington</td>
+          <td>January 11, 2014</td>
+          <td>jamieharingonton@yahoo.com</td>
           <td>Yes</td>
         </tr>
       </tbody>
@@ -404,17 +404,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           <td class="negative">None</td>
         </tr>
         <tr class="positive">
-          <td>Jimmy</td>
+          <td>Jude</td>
           <td><i class="icon checkmark"></i> Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Unknown</td>
           <td class="positive"><i class="icon close"></i> Requires call</td>
         </tr>
         <tr class="negative">
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Unknown</td>
           <td>None</td>
         </tr>
@@ -441,17 +441,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           <td>None</td>
         </tr>
         <tr class="error">
-          <td>Jimmy</td>
+          <td>Jude</td>
           <td>Cannot pull data</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td class="error"><i class="attention icon"></i> Classified</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
@@ -477,19 +477,19 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           <td>None</td>
         </tr>
         <tr class="warning">
-          <td>Jimmy</td>
+          <td>Jude</td>
           <td><i class="attention icon"></i> Requires Action</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Unknown</td>
-          <td class="warning"><i class="attention icon"></i> Hostile</td>
+          <td>None</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Unknown</td>
-          <td>None</td>
+          <td class="warning"><i class="attention icon"></i> Hostile</td>
         </tr>
       </tbody>
     </table>
@@ -513,17 +513,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           <td>Requires call</td>
         </tr>
         <tr class="active">
-          <td>John</td>
+          <td>Jude</td>
           <td>Selected</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td class="active">Jill</td>
+          <td class="active">Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
@@ -548,17 +548,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Selected</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td class="disabled">Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td class="disabled">Jill</td>
+          <td>Jamie</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
@@ -584,23 +584,23 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John Lilki</td>
+          <td>Jude Lilki</td>
           <td>September 14, 2013</td>
           <td>jhlilk22@yahoo.com</td>
           <td>No</td>
         </tr>
-        <tr>
-          <td>Jamie Harington</td>
-          <td>January 11, 2014</td>
-          <td>jamieharingonton@yahoo.com</td>
-          <td>Yes</td>
-        </tr>
         <tr>
           <td>Jill Lewis</td>
           <td>May 11, 2014</td>
           <td>jilsewris22@yahoo.com</td>
           <td>Yes</td>
         </tr>
+        <tr>
+          <td>Jamie Harington</td>
+          <td>January 11, 2014</td>
+          <td>jamieharingonton@yahoo.com</td>
+          <td>Yes</td>
+        </tr>
       </tbody>
     </table>
   </div>
@@ -620,19 +620,19 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
-          <td>John is an interesting boy but sometimes you don't really have enough room to describe everything you'd like</td>
+          <td>Jude is an interesting person but sometimes you don't really have enough room to describe everything you'd like</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
-          <td>Jamie is a kind girl but sometimes you don't really have enough room to describe everything you'd like</td>
+          <td>Jamie is a kind person but sometimes you don't really have enough room to describe everything you'd like</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
-          <td>Jill is an alright girl but sometimes you don't really have enough room to describe everything you'd like</td>
+          <td>Jamie is an all-right person but sometimes you don't really have enough room to describe everything you'd like</td>
         </tr>
       </tbody>
     </table>
@@ -649,17 +649,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td title="This is much too long to fit I'm sorry about that">This is much too long to fit I'm sorry about that</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Shorter description</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>Shorter description</td>
         </tr>
@@ -681,17 +681,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td class="right aligned">None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td class="right aligned">Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td class="right aligned">None</td>
         </tr>
@@ -708,17 +708,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td class="right aligned">None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td class="right aligned">Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td class="right aligned">None</td>
         </tr>
@@ -741,32 +741,32 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>No Action</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>None</td>
         </tr>
         <tr class="warning">
-          <td>John</td>
+          <td>Jude</td>
           <td>No Action</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td class="positive">Approved</td>
           <td class="warning">Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td class="negative">Denied</td>
           <td>None</td>
         </tr>
@@ -784,17 +784,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td class="right aligned">None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td class="right aligned">Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td class="right aligned">None</td>
         </tr>
@@ -816,42 +816,42 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>No Action</td>
           <td class="selectable">
             <a href="#">Edit</a>
           </td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td class="selectable">
             <a href="#">Edit</a>
           </td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td class="selectable">
             <a href="#">Edit</a>
           </td>
         </tr>
         <tr class="warning">
-          <td>John</td>
+          <td>Jude</td>
           <td>No Action</td>
           <td class="selectable warning">
             <a href="#">Requires change</a>
           </td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td class="positive">Approved</td>
           <td class="selectable positive">
             <a href="#">Approve</a>
           </td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td class="negative">Denied</td>
           <td class="selectable negative">
             <a href="#">Remove</a>
@@ -874,7 +874,7 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr class="top aligned">
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td class="top aligned">
             Notes<br>
@@ -883,7 +883,7 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           </td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td class="bottom aligned">Approved</td>
           <td>
             Notes<br>
@@ -908,17 +908,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr class="center aligned">
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td class="right aligned">None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td class="right aligned">Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td class="right aligned">None</td>
         </tr>
@@ -940,17 +940,11 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John Lilki</td>
+          <td>Jude Lilki</td>
           <td>September 14, 2013</td>
           <td>jhlilk22@yahoo.com</td>
           <td>No</td>
         </tr>
-        <tr>
-          <td>Jamie Harington</td>
-          <td>January 11, 2014</td>
-          <td>jamieharingonton@yahoo.com</td>
-          <td>Yes</td>
-        </tr>
         <tr>
           <td>Jill Lewis</td>
           <td>May 11, 2014</td>
@@ -958,23 +952,23 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           <td>Yes</td>
         </tr>
         <tr>
-          <td>John Lilki</td>
+          <td>Jamie Harington</td>
+          <td>January 11, 2014</td>
+          <td>jamieharingonton@yahoo.com</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Jude Lilki</td>
           <td>September 14, 2013</td>
           <td>jhlilk22@yahoo.com</td>
           <td>No</td>
         </tr>
         <tr>
-          <td>John Lilki</td>
+          <td>Jude Lilki</td>
           <td>September 14, 2013</td>
           <td>jhlilk22@yahoo.com</td>
           <td>No</td>
         </tr>
-        <tr>
-          <td>Jamie Harington</td>
-          <td>January 11, 2014</td>
-          <td>jamieharingonton@yahoo.com</td>
-          <td>Yes</td>
-        </tr>
         <tr>
           <td>Jill Lewis</td>
           <td>May 11, 2014</td>
@@ -982,7 +976,13 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           <td>Yes</td>
         </tr>
         <tr>
-          <td>John Lilki</td>
+          <td>Jamie Harington</td>
+          <td>January 11, 2014</td>
+          <td>jamieharingonton@yahoo.com</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>Jude Lilki</td>
           <td>September 14, 2013</td>
           <td>jhlilk22@yahoo.com</td>
           <td>No</td>
@@ -1004,17 +1004,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>None</td>
         </tr>
@@ -1040,17 +1040,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>None</td>
         </tr>
@@ -1068,17 +1068,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>None</td>
         </tr>
@@ -1136,26 +1136,26 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>22</td>
-          <td>Male</td>
-          <td>None</td>
-        </tr>
-        <tr>
-          <td>Jamie</td>
-          <td>Approved</td>
-          <td>32</td>
-          <td>Male</td>
+          <td>Non-binary</td>
           <td>Requires call</td>
         </tr>
         <tr>
           <td>Jill</td>
-          <td>Denied</td>
+          <td>Approved</td>
           <td>22</td>
           <td>Female</td>
           <td>None</td>
         </tr>
+        <tr>
+          <td>Jamie</td>
+          <td>Denied</td>
+          <td>32</td>
+          <td>Male</td>
+          <td>None</td>
+        </tr>
       </tbody>
       <tfoot>
         <th>3 People</th>
@@ -1178,15 +1178,15 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
         </tr>
       </tbody>
@@ -1210,17 +1210,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>None</td>
         </tr>
@@ -1467,17 +1467,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>None</td>
         </tr>
@@ -1725,17 +1725,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>No Action</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td class="positive">Approved</td>
           <td class="warning">Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td class="negative">Denied</td>
           <td>None</td>
         </tr>
@@ -1767,7 +1767,7 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
               <input type="checkbox"> <label></label>
             </div>
           </td>
-          <td>John Lilki</td>
+          <td>Jude Lilki</td>
           <td>September 14, 2013</td>
           <td>jhlilk22@yahoo.com</td>
           <td>No</td>
@@ -1778,9 +1778,9 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
               <input type="checkbox"> <label></label>
             </div>
           </td>
-          <td>Jamie Harington</td>
-          <td>January 11, 2014</td>
-          <td>jamieharingonton@yahoo.com</td>
+          <td>Jill Lewis</td>
+          <td>May 11, 2014</td>
+          <td>jilsewris22@yahoo.com</td>
           <td>Yes</td>
         </tr>
         <tr>
@@ -1789,9 +1789,9 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
               <input type="checkbox"> <label></label>
             </div>
           </td>
-          <td>Jill Lewis</td>
-          <td>May 11, 2014</td>
-          <td>jilsewris22@yahoo.com</td>
+          <td>Jamie Harington</td>
+          <td>January 11, 2014</td>
+          <td>jamieharingonton@yahoo.com</td>
           <td>Yes</td>
         </tr>
       </tbody>
@@ -1826,14 +1826,14 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
-          <td>He is a very nice guy and I enjoyed talking to him on the telephone. I hope we get to talk again.</td>
+          <td>He is a very nice person and I enjoyed talking to him on the telephone. I hope we get to talk again.</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
-          <td>Jamie was not interested in purchasing our product.</td>
+          <td>Jill was not interested in purchasing our product.</td>
         </tr>
       </tbody>
     </table>
@@ -1849,14 +1849,14 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
-          <td>He is a very nice guy and I enjoyed talking to him on the telephone. I hope we get to talk again.</td>
+          <td>He is a very nice person and I enjoyed talking to him on the telephone. I hope we get to talk again.</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
-          <td>Jamie was not interested in purchasing our product.</td>
+          <td>Jill was not interested in purchasing our product.</td>
         </tr>
       </tbody>
     </table>
@@ -1874,17 +1874,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
@@ -1894,17 +1894,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
@@ -1926,19 +1926,19 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>Approved</td>
           <td>None</td>
@@ -1950,19 +1950,19 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>Approved</td>
           <td>None</td>
@@ -1990,17 +1990,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>None</td>
         </tr>
@@ -2023,17 +2023,17 @@ themes      : ['Default', 'Basic', 'Classic', 'GitHub']
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>None</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
           <td>Requires call</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>None</td>
         </tr>
diff --git a/server/documents/introduction/new.html.eco b/server/documents/introduction/new.html.eco
index 48a1a811cd..6b430223cb 100644
--- a/server/documents/introduction/new.html.eco
+++ b/server/documents/introduction/new.html.eco
@@ -1303,19 +1303,19 @@ type        : 'Main'
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td>Male</td>
         </tr>
         <tr>
-          <td>Jamie</td>
+          <td>Jill</td>
           <td>Approved</td>
-          <td>Male</td>
+          <td>Female</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
-          <td>Female</td>
+          <td>Male</td>
         </tr>
       </tbody>
     </table>
@@ -1332,17 +1332,17 @@ type        : 'Main'
       </thead>
       <tbody>
         <tr>
-          <td>John</td>
+          <td>Jude</td>
           <td>Approved</td>
           <td title="This is much too long to fit I'm sorry about that">This is much too long to fit I'm sorry about that</td>
         </tr>
         <tr>
-          <td>Jamie</td>
-          <td>Approved</td>
+          <td>Jill</td>
+          <td>Denied</td>
           <td>Shorter description</td>
         </tr>
         <tr>
-          <td>Jill</td>
+          <td>Jamie</td>
           <td>Denied</td>
           <td>Shorter description</td>
         </tr>
@@ -1499,8 +1499,10 @@ type        : 'Main'
           <label>Gender</label>
           <select class="ui dropdown">
             <option value="">Gender</option>
-            <option value="1">Male</option>
-            <option value="0">Female</option>
+            <option value="1">Female</option>
+            <option value="2">Male</option>
+            <option value="3">Non-binary</option>
+            <option value="4">None of the above</option>
           </select>
         </div>
         <div class="field">
diff --git a/server/documents/modules/dropdown.html.eco b/server/documents/modules/dropdown.html.eco
index 4f3dd0119b..0f5861f643 100755
--- a/server/documents/modules/dropdown.html.eco
+++ b/server/documents/modules/dropdown.html.eco
@@ -83,16 +83,20 @@ themes      : ['Default', 'GitHub', 'Material']
         <i class="dropdown icon"></i>
         <div class="default text">Gender</div>
         <div class="menu">
-          <div class="item" data-value="1">Male</div>
-          <div class="item" data-value="0">Female</div>
+          <div class="item" data-value="1">Female</div>
+          <div class="item" data-value="2">Male</div>
+          <div class="item" data-value="3">Non-binary</div>
+          <div class="item" data-value="4">None of the above</div>
         </div>
       </div>
     </div>
     <div class="another dropdown example">
       <select class="ui dropdown">
         <option value="">Gender</option>
-        <option value="1">Male</option>
-        <option value="0">Female</option>
+        <option value="1">Female</option>
+        <option value="2">Male</option>
+        <option value="3">Non-binary</option>
+        <option value="4">None of the above</option>
       </select>
     </div>
     <div class="another dropdown example">
@@ -1865,8 +1869,10 @@ themes      : ['Default', 'GitHub', 'Material']
             <div class="default text">Select Gender</div>
             <i class="dropdown icon"></i>
             <div class="menu">
-              <div class="item" data-value="male">Male</div>
               <div class="item" data-value="female">Female</div>
+              <div class="item" data-value="male">Male</div>
+              <div class="item" data-value="non-binary">Non-binary</div>
+              <div class="item" data-value="not-listed">None of the above</div>
             </div>
           </div>
         </div>
@@ -1888,8 +1894,10 @@ themes      : ['Default', 'GitHub', 'Material']
           <i class="dropdown icon"></i>
           <div class="default text">Gender</div>
           <div class="menu">
-            <div class="item" data-value="male">Male</div>
             <div class="item" data-value="female">Female</div>
+            <div class="item" data-value="male">Male</div>
+            <div class="item" data-value="non-binary">Non-binary</div>
+            <div class="item" data-value="not-listed">None of the above</div>
           </div>
         </div>
       </div>
@@ -1918,13 +1926,21 @@ themes      : ['Default', 'GitHub', 'Material']
           .dropdown({
             values: [
               {
-                name: 'Male',
-                value: 'male'
+                name     : 'Female',
+                value    : 'female'
               },
               {
-                name     : 'Female',
-                value    : 'female',
+                name     : 'Male',
+                value    : 'male'
+              },
+              {
+                name     : 'Non-binary',
+                value    : 'non-binary',
                 selected : true
+              }, 
+              {
+                name     : 'None of the above',
+                value    : 'not-listed'
               }
             ]
           })
@@ -1942,13 +1958,21 @@ themes      : ['Default', 'GitHub', 'Material']
           <i class="dropdown icon"></i>
           <div class="default text">Gender</div>
           <div class="menu">
+            <div class="item" data-value="female" data-text="Female">
+              <i class="venus icon"></i>
+              Female
+            </div>
             <div class="item" data-value="male" data-text="Male">
-              <i class="male icon"></i>
+              <i class="mars icon"></i>
               Male
             </div>
-            <div class="item" data-value="female" data-text="Female">
-              <i class="female icon"></i>
-              Female
+            <div class="item" data-value="non-binary" data-text="Non-binary">
+              <i class="bolt icon"></i>
+              Non-binary
+            </div>
+            <div class="item" data-value="not-listed" data-text="None of the above">
+              <i class="expand icon"></i>
+              None of the above
             </div>
           </div>
         </div>
@@ -1958,13 +1982,21 @@ themes      : ['Default', 'GitHub', 'Material']
         <i class="dropdown icon"></i>
         <div class="default text">Gender</div>
         <div class="menu">
+          <div class="item" data-value="female" data-text="Female">
+            <i class="venus icon"></i>
+            Female
+          </div>
           <div class="item" data-value="male" data-text="Male">
-            <i class="male icon"></i>
+            <i class="mars icon"></i>
             Male
           </div>
-          <div class="item" data-value="female" data-text="Female">
-            <i class="female icon"></i>
-            Female
+          <div class="item" data-value="non-binary" data-text="Non-binary">
+            <i class="bolt icon"></i>
+            Non-binary
+          </div>
+          <div class="item" data-value="not-listed" data-text="None of the above">
+            <i class="expand icon"></i>
+            None of the above
           </div>
         </div>
       </div>
@@ -1975,8 +2007,10 @@ themes      : ['Default', 'GitHub', 'Material']
       <div class="code" data-label="HTML" data-type="html">
         <select name="gender" class="ui dropdown" id="select">
           <option value="">Gender</option>
-          <option value="male">Male</option>
           <option value="female">Female</option>
+          <option value="male">Male</option>
+          <option value="non-binary">Non-binary</option>
+          <option value="not-listed">None of the above</option>
         </select>
       </div>
       <div class="code" data-type="javascript" data-demo="true">
@@ -1986,8 +2020,10 @@ themes      : ['Default', 'GitHub', 'Material']
       </div>
       <select class="ui dropdown" name="gender" id="select">
         <option value="">Gender</option>
-        <option value="male">Male</option>
         <option value="female">Female</option>
+        <option value="male">Male</option>
+        <option value="non-binary">Non-binary</option>
+        <option value="not-listed">None of the above</option>
       </select>
     </div>
     <div class="no example">
diff --git a/server/documents/modules/transition.html.eco b/server/documents/modules/transition.html.eco
index 2bdf656d30..3463558d6f 100755
--- a/server/documents/modules/transition.html.eco
+++ b/server/documents/modules/transition.html.eco
@@ -506,18 +506,18 @@ type        : 'UI Module'
       <table class="ui demo table">
         <tbody>
           <tr>
-            <td>John Lilki</td>
+            <td>Jude Lilki</td>
             <td>jhlilk22@yahoo.com</td>
             <td>No</td>
           </tr>
           <tr>
-            <td>Jamie Harington</td>
-            <td>jamieharingonton@yahoo.com</td>
+            <td>Jill Lewis</td>
+            <td>jilsewris22@yahoo.com</td>
             <td>Yes</td>
           </tr>
           <tr>
-            <td>Jill Lewis</td>
-            <td>jilsewris22@yahoo.com</td>
+            <td>Jamie Harington</td>
+            <td>jamieharingonton@yahoo.com</td>
             <td>Yes</td>
           </tr>
         </tbody>
diff --git a/server/documents/views/comment.html.eco b/server/documents/views/comment.html.eco
index 4a5127837b..1bed09db85 100755
--- a/server/documents/views/comment.html.eco
+++ b/server/documents/views/comment.html.eco
@@ -147,7 +147,7 @@ themes      : ['Default', 'Chubby']
             </div>
           </div>
           <div class="text">
-            Hey guys, I hope this example comment is helping you read this documentation.
+            Hey folks, I hope this example comment is helping you read this documentation.
           </div>
         </div>
       </div>