diff --git a/stock/templates/registered/timermanagement.html b/stock/templates/registered/timermanagement.html
index de68535d..bdc3332b 100755
--- a/stock/templates/registered/timermanagement.html
+++ b/stock/templates/registered/timermanagement.html
@@ -90,6 +90,37 @@
                             POS [L]
                         </div>
                     {% endifequal %}
+                    {% ifequal timer.structure "Citadel[M]" %}
+                        <div class="label label-danger">
+                            Citadel [M]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "Citadel[L]" %}
+                        <div class="label label-danger">
+                            Citadel [L]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "Citadel[XL]" %}
+                        <div class="label label-danger">
+                            Citadel [XL]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "Engineering Complex[M]" %}
+                        <div class="label label-warning">
+                            Engineering Complex [M]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "Engineering Complex[L]" %}
+                        <div class="label label-warning">
+                            Engineering Complex [L]
+                        </div>
+                    {% endifequal %}
+                    {% ifequal timer.structure "Engineering Complex[XL]" %}
+                        <div class="label label-warning">
+                            Engineering Complex [XL]
+                        </div>
+                    {% endifequal %}
+
                     {% ifequal timer.structure "Station" %}
                         <div class="label label-danger">
                             Station
@@ -191,11 +222,41 @@
                         POS [L]
                     </div>
                 {% endifequal %}
+              {% ifequal timer.structure "Citadel[M]" %}
+                    <div class="label label-danger">
+                        Citadel [M]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Citadel[L]" %}
+                    <div class="label label-danger">
+                        Citadel [L]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Citadel[XL]" %}
+                    <div class="label label-danger">
+                        Citadel [XL]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Engineering Complex[M]" %}
+                    <div class="label label-warning">
+                        Engineering Complex [M]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Engineering Complex[L]" %}
+                    <div class="label label-warning">
+                        Engineering Complex [L]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Engineering Complex[XL]" %}
+                    <div class="label label-warning">
+                        Engineering Complex [XL]
+                    </div>
+                {% endifequal %}
                 {% ifequal timer.structure "Station" %}
                     <div class="label label-danger">
                         Station
                     </div>
-		{% endifequal %}
+	        	{% endifequal %}
                 {% ifequal timer.structure "TCU" %}
                     <div class="label label-danger">
                         TCU
@@ -292,6 +353,36 @@
                     <div class="label label-info">
                         POS [L]
                     </div>
+                {% endifequal %}
+                 {% ifequal timer.structure "Citadel[M]" %}
+                    <div class="label label-danger">
+                        Citadel [M]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Citadel[L]" %}
+                    <div class="label label-danger">
+                        Citadel [L]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Citadel[XL]" %}
+                    <div class="label label-danger">
+                        Citadel [XL]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Engineering Complex[M]" %}
+                    <div class="label label-warning">
+                        Engineering Complex [M]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Engineering Complex[L]" %}
+                    <div class="label label-warning">
+                        Engineering Complex [L]
+                    </div>
+                {% endifequal %}
+                {% ifequal timer.structure "Engineering Complex[XL]" %}
+                    <div class="label label-warning">
+                        Engineering Complex [XL]
+                    </div>
                 {% endifequal %}
                 {% ifequal timer.structure "Station" %}
                     <div class="label label-danger">
diff --git a/timerboard/form.py b/timerboard/form.py
index 41685305..c4db4102 100755
--- a/timerboard/form.py
+++ b/timerboard/form.py
@@ -6,8 +6,12 @@ from django.utils.translation import ugettext_lazy as _
 
 class TimerForm(forms.Form):
     structure_choices = [('POCO', 'POCO'), ('I-HUB', 'I-HUB'), ('POS[S]', 'POS[S]'),
-                         ('POS[M]', 'POS[M]'), ('POS[L]', 'POS[L]'), ('Station', 'Station'), ('TCU', 'TCU'),
-                         (_('Other'), _('Other'))]
+                         ('POS[M]', 'POS[M]'), ('POS[L]', 'POS[L]'), ('Citadel[M]', 'Citadel[M]'),
+                         ('Citadel[L]', 'Citadel[L]'), ('Citadel[XL]', 'Citadel[XL]'),
+                         ('Engineering Complex[M]', 'Engineering Complex[M]'),
+                         ('Engineering Complex[L]', 'Engineering Complex[L]'),
+                         ('Engineering Complex[XL]', 'Engineering Complex[XL]'),
+                         ('Station', 'Station'), ('TCU', 'TCU'), (_('Other'), _('Other'))]
     objective_choices = [('Friendly', _('Friendly')), ('Hostile', _('Hostile')), ('Neutral', _('Neutral'))]
 
     details = forms.CharField(max_length=254, required=True, label=_('Details'))