diff --git a/themes/official/js/05-bbclear.js b/themes/official/js/05-bbclear.js
index a257ffd..015bfda 100644
--- a/themes/official/js/05-bbclear.js
+++ b/themes/official/js/05-bbclear.js
@@ -209,8 +209,12 @@ var filters = {
     },
 
     gender_pronoun: function(input, possessive, absolute){
+        // sanitize input
+        input = input.toLowerCase();
         if(input == "female"){
             return possessive ? (absolute ? "hers" : "her") : "she";
+        }else if(input == "other"){
+            return possessive ? (absolute ? "theirs" : "their") : "they";
         }else{
             return possessive ? "his" : "he";
         }
diff --git a/themes/official/template.html b/themes/official/template.html
index ba30960..9ebef29 100644
--- a/themes/official/template.html
+++ b/themes/official/template.html
@@ -33,11 +33,13 @@ <h1>{{demographics.name|full_name}}</h1>
                 <p class="narrative">
                     <span class="general">
                         <strong>{{demographics.name|display_name}}</strong> is a {% if demographics.dob %}<strong>{{demographics.dob|age}}</strong> year old{% endif %}
-                        <strong>{% if demographics.race %}{{demographics.race}} {% endif %}{% if demographics.marital_status %}{{demographics.marital_status|lower}} {% endif %}{{demographics.gender|lower}}</strong>
+                        <strong>{% if demographics.race %}{{demographics.race}}{% endif %}
+                            {% if demographics.marital_status %}{{demographics.marital_status|lower}} {% endif %}
+                            {{demographics.gender|lower}}{% if demographics.gender == "Other" %}/non-binary{% endif %}</strong>
                         {% if demographics.religion or demographics.language %}who {% if demographics.religion %}is <strong>{{demographics.religion}}</strong>{% if demographics.language %} and {% endif %}{% endif %}{% if demographics.language %}speaks <strong>{{demographics.language|isolanguage|title}}</strong>{% endif %}{% endif %}.
                     </span>
                     <span class="allergies">
-                        {{demographics.gender|gender_pronoun|title}} has <strong class="{{allergies|max_severity}}">{{allergies|max_severity}} allergies</strong>.
+                        {{demographics.gender|gender_pronoun|title}}  {% if demographics.gender  == "Other" %} have {{gender_pronoun}} {% else %} has {% endif %} <strong class="{{allergies|max_severity}}">{{allergies|max_severity}} allergies</strong>.
                     </span>
                     <span class="yearReview">
                         In the past year, {{demographics.gender|gender_pronoun}}
@@ -47,7 +49,8 @@ <h1>{{demographics.name|full_name}}</h1>
                             {% else %}
                                 had <strong>medical encounters</strong>
                             {% endif %}
-                        </span> and has <span id="yearReviewMedications">
+                        </span> and {% if demographics.gender  == "Other" %} have {{gender_pronoun}} {% else %} has {% endif %}
+<span id="yearReviewMedications">
                             {% if medications|since_days(365)|strict_length == 0 %}
                                 not had any medications prescribed.
                             {% else %}