diff --git a/allianceauth/timerboard/form.py b/allianceauth/timerboard/form.py
index 8a485436..3969b9b4 100755
--- a/allianceauth/timerboard/form.py
+++ b/allianceauth/timerboard/form.py
@@ -38,17 +38,17 @@ class TimerForm(forms.ModelForm):
                          ('POS[S]', 'POS[S]'),
                          ('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]'),
-                         ('Refinery[M]', 'Refinery[M]'),
-                         ('Refinery[L]', 'Refinery[L]'),
-                         ('Cyno Beacon','Cyno Beacon'),
-                         ('Cyno Jammer','Cyno Jammer'),
-                         ('Jump Gate','Jump Gate'),
+                         ('Astrahus', 'Astrahus'),
+                         ('Fortizar', 'Fortizar'),
+                         ('Keepstar', 'Keepstar'),
+                         ('Raitaru', 'Raitaru'),
+                         ('Azbel', 'Azbel'),
+                         ('Sotiyo', 'Sotiyo'),
+                         ('Athanor', 'Athanor'),
+                         ('Tatara', 'Tatara'),
+                         ('Pharolux Cyno Beacon', 'Pharolux Cyno Beacon'),
+                         ('Tenebrex Cyno Jammer', 'Tenebrex Cyno Jammer'),
+                         ('Ansiblex Jump Gate', 'Ansiblex Jump Gate'),
                          ('Moon Mining Cycle', 'Moon Mining Cycle'),
                          (_('Other'), _('Other'))]
     objective_choices = [('Friendly', _('Friendly')),
diff --git a/allianceauth/timerboard/templates/timerboard/view.html b/allianceauth/timerboard/templates/timerboard/view.html
index c9b2cb63..198af430 100644
--- a/allianceauth/timerboard/templates/timerboard/view.html
+++ b/allianceauth/timerboard/templates/timerboard/view.html
@@ -37,128 +37,128 @@
                     {% endif %}
                 </tr>
                 {% for timer in corp_timers %}
-                    {% ifequal timer.important True %}
+                    {% if timer.important == True %}
                         <tr class="danger">
                             {% else %}
                         <tr class="info">
-                    {% endifequal %}
+                    {% endif %}
                 <td style="width:150px" class="text-center">{{ timer.details }}</td>
                 <td class="text-center">
-                    {% ifequal timer.objective "Hostile" %}
+                    {% if timer.objective == "Hostile" %}
                         <div class="label label-danger">
                             {% trans "Hostile" %}
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.objective "Friendly" %}
+                    {% endif %}
+                    {% if timer.objective == "Friendly" %}
                         <div class="label label-primary">
                             {% trans "Friendly" %}
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.objective "Neutral" %}
+                    {% endif %}
+                    {% if timer.objective == "Neutral" %}
                         <div class="label label-default">
                             {% trans "Neutral" %}
                         </div>
-                    {% endifequal %}
+                    {% endif %}
                 </td>
                 <td class="text-center"><a
                         href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
                 </td>
                 <td class="text-center">
-                    {% ifequal timer.structure "POCO" %}
+                    {% if timer.structure == "POCO" %}
                         <div class="label label-info">
                             POCO
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "I-HUB" %}
+                    {% endif %}
+                    {% if timer.structure == "I-HUB" %}
                         <div class="label label-warning">
                             I-HUB
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "TCU" %}
+                    {% endif %}
+                    {% if timer.structure == "TCU" %}
                         <div class="label label-danger">
                             TCU
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[S]" %}
+                    {% endif %}
+                    {% if timer.structure == "POS[S]" %}
                         <div class="label label-info">
                             POS [S]
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "POS[M]" %}
                         <div class="label label-info">
                             POS [M]
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "POS[L]" %}
                         <div class="label label-info">
                             POS [L]
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Citadel[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
                         <div class="label label-danger">
-                            Citadel [M]
+                            Astrahus
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Citadel[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
                         <div class="label label-danger">
-                            Citadel [L]
+                            Fortizar
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Citadel[XL]" %}
+                    {% endif %}
+                    {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
                         <div class="label label-danger">
-                            Citadel [XL]
+                            Keepstar
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Engineering Complex[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
                         <div class="label label-warning">
-                            Engineering Complex [M]
+                            Raitaru
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Engineering Complex[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
                         <div class="label label-warning">
-                            Engineering Complex [L]
+                            Azbel
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Engineering Complex[XL]" %}
+                    {% endif %}
+                    {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
                         <div class="label label-warning">
-                            Engineering Complex [XL]
+                            Sotiyo
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Refinery[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
                         <div class="label label-warning">
-                            Refinery [M]
+                            Athanor
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Refinery[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara"%}
                         <div class="label label-warning">
-                            Refinery [L]
+                            Tatara
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Cyno Beacon" %}
+                    {% endif %}
+                    {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
                         <div class="label label-warning">
                             Cyno Beacon
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Cyno Jammer" %}
+                    {% endif %}
+                    {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
                         <div class="label label-warning">
-                            Cyno Jammer
+                            Tenebrex Cyno Jammer
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Jump Gate" %}
+                    {% endif %}
+                    {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
                         <div class="label label-warning">
-                            Jump Gate
+                            Ansiblex Jump Gate
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Moon Mining Cycle" %}
+                    {% endif %}
+                    {% if timer.structure == "Moon Mining Cycle" %}
                         <div class="label label-success">
                             Moon Mining Cycle
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Other" %}
+                    {% endif %}
+                    {% if timer.structure == "Other" %}
                         <div class="label label-default">
                             Other
                         </div>
-                    {% endifequal %}
+                    {% endif %}
                 </td>
                 <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
                 <td class="text-center" nowrap>
@@ -196,128 +196,128 @@
                 {% endif %}
             </tr>
             {% for timer in future_timers %}
-                {% ifequal timer.important True %}
+                {% if timer.important == True %}
                     <tr class="danger">
                 {% else %}
                     <tr class="info">
-                {% endifequal %}
+                {% endif %}
                 <td style="width:150px" class="text-center">{{ timer.details }}</td>
                 <td class="text-center">
-                {% ifequal timer.objective "Hostile" %}
+                {% if timer.objective == "Hostile" %}
                     <div class="label label-danger">
                         {% trans "Hostile" %}
                     </div>
-                {% endifequal %}
-                {% ifequal timer.objective "Friendly" %}
+                {% endif %}
+                {% if timer.objective == "Friendly" %}
                     <div class="label label-primary">
                         {% trans "Friendly" %}
                     </div>
-                {% endifequal %}
-                {% ifequal timer.objective "Neutral" %}
+                {% endif %}
+                {% if timer.objective == "Neutral" %}
                     <div class="label label-default">
                         {% trans "Neutral" %}
                     </div>
-                {% endifequal %}
+                {% endif %}
                 </td>
                 <td class="text-center">
                     <a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
                 </td>
                 <td class="text-center">
-                    {% ifequal timer.structure "POCO" %}
+                    {% if timer.structure == "POCO" %}
                         <div class="label label-info">
                             POCO
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "I-HUB" %}
+                    {% endif %}
+                    {% if timer.structure == "I-HUB" %}
                         <div class="label label-warning">
                             I-HUB
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "TCU" %}
+                    {% endif %}
+                    {% if timer.structure == "TCU" %}
                         <div class="label label-danger">
                             TCU
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[S]" %}
+                    {% endif %}
+                    {% if timer.structure == "POS[S]" %}
                         <div class="label label-info">
                             POS [S]
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "POS[M]" %}
                         <div class="label label-info">
                             POS [M]
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "POS[L]" %}
                         <div class="label label-info">
                             POS [L]
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Citadel[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
                         <div class="label label-danger">
-                            Citadel [M]
+                            Astrahus
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Citadel[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
                         <div class="label label-danger">
-                            Citadel [L]
+                            Fortizar
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Citadel[XL]" %}
+                    {% endif %}
+                    {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
                         <div class="label label-danger">
-                            Citadel [XL]
+                            Keepstar
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Engineering Complex[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
                         <div class="label label-warning">
-                            Engineering Complex [M]
+                            Raitaru
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Engineering Complex[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
                         <div class="label label-warning">
-                            Engineering Complex [L]
+                            Azbel
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Engineering Complex[XL]" %}
+                    {% endif %}
+                    {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
                         <div class="label label-warning">
-                            Engineering Complex [XL]
+                            Sotiyo
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Refinery[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
                         <div class="label label-warning">
-                            Refinery [M]
+                            Athanor
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Refinery[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
                         <div class="label label-warning">
-                            Refinery [L]
+                            Tatara
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Cyno Beacon" %}
+                    {% endif %}
+                    {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
                         <div class="label label-warning">
-                            Cyno Beacon
+                            Pharolux Cyno Beacon
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Cyno Jammer" %}
+                    {% endif %}
+                    {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
                         <div class="label label-warning">
-                            Cyno Jammer
+                            Tenebrex Cyno Jammer
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Jump Gate" %}
+                    {% endif %}
+                    {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
                         <div class="label label-warning">
-                            Jump Gate
+                            Ansiblex Jump Gate
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Moon Mining Cycle" %}
+                    {% endif %}
+                    {% if timer.structure == "Moon Mining Cycle" %}
                         <div class="label label-success">
                             Moon Mining Cycle
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Other" %}
+                    {% endif %}
+                    {% if timer.structure == "Other" %}
                         <div class="label label-default">
                             Other
                         </div>
-                    {% endifequal %}
+                    {% endif %}
                 </td>
                 <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
                 <td class="text-center" nowrap>
@@ -357,128 +357,128 @@
                 {% endif %}
             </tr>
             {% for timer in past_timers %}
-                {% ifequal timer.important True %}
+                {% if timer.important == True %}
                     <tr class="danger">
                         {% else %}
                     <tr class="info">
-                {% endifequal %}
+                {% endif %}
                 <td style="width:150px" class="text-center">{{ timer.details }}</td>
                 <td class="text-center">
-                {% ifequal timer.objective "Hostile" %}
+                {% if timer.objective == "Hostile" %}
                     <div class="label label-danger">
                         {% trans "Hostile" %}
                     </div>
-                {% endifequal %}
-                {% ifequal timer.objective "Friendly" %}
+                {% endif %}
+                {% if timer.objective == "Friendly" %}
                     <div class="label label-primary">
                         {% trans "Friendly" %}
                     </div>
-                {% endifequal %}
-                {% ifequal timer.objective "Neutral" %}
+                {% endif %}
+                {% if timer.objective == "Neutral" %}
                     <div class="label label-default">
                         {% trans "Neutral" %}
                     </div>
-                {% endifequal %}
+                {% endif %}
                 </td>
                 <td class="text-center">
                     <a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
                 </td>
                 <td class="text-center">
-                    {% ifequal timer.structure "POCO" %}
+                    {% if timer.structure == "POCO" %}
                         <div class="label label-info">
                             POCO
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "I-HUB" %}
+                    {% endif %}
+                    {% if timer.structure == "I-HUB" %}
                         <div class="label label-warning">
                             I-HUB
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "TCU" %}
+                    {% endif %}
+                    {% if timer.structure == "TCU" %}
                         <div class="label label-danger">
                             TCU
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[S]" %}
+                    {% endif %}
+                    {% if timer.structure == "POS[S]" %}
                         <div class="label label-info">
                             POS [S]
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "POS[M]" %}
                         <div class="label label-info">
                             POS [M]
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "POS[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "POS[L]" %}
                         <div class="label label-info">
                             POS [L]
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Citadel[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "Citadel[M]" or timer.structure == "Astrahus" %}
                         <div class="label label-danger">
-                            Citadel [M]
+                            Astrahus
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Citadel[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "Citadel[L]" or timer.structure == "Fortizar" %}
                         <div class="label label-danger">
-                            Citadel [L]
+                            Fortizar
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Citadel[XL]" %}
+                    {% endif %}
+                    {% if timer.structure == "Citadel[XL]" or timer.structure == "Keepstar" %}
                         <div class="label label-danger">
-                            Citadel [XL]
+                            Keepstar
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Engineering Complex[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "Engineering Complex[M]" or timer.structure == "Raitaru" %}
                         <div class="label label-warning">
-                            Engineering Complex [M]
+                            Raitaru
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Engineering Complex[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "Engineering Complex[L]" or timer.structure == "Azbel" %}
                         <div class="label label-warning">
-                            Engineering Complex [L]
+                            Azbel
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Engineering Complex[XL]" %}
+                    {% endif %}
+                    {% if timer.structure == "Engineering Complex[XL]" or timer.structure == "Sotiyo" %}
                         <div class="label label-warning">
-                            Engineering Complex [XL]
+                            Sotiyo
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Refinery[M]" %}
+                    {% endif %}
+                    {% if timer.structure == "Refinery[M]" or timer.structure == "Athanor" %}
                         <div class="label label-warning">
-                            Refinery [M]
+                            Athanor
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Refinery[L]" %}
+                    {% endif %}
+                    {% if timer.structure == "Refinery[L]" or timer.structure == "Tatara" %}
                         <div class="label label-warning">
-                            Refinery [L]
+                            Tatara
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Cyno Beacon" %}
+                    {% endif %}
+                    {% if timer.structure == "Cyno Beacon" or timer.structure == "Pharolux Cyno Beacon" %}
                         <div class="label label-warning">
-                            Cyno Beacon
+                            Pharolux Cyno Beacon
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Cyno Jammer" %}
+                    {% endif %}
+                    {% if timer.structure == "Cyno Jammer" or timer.structure == "Tenebrex Cyno Jammer" %}
                         <div class="label label-warning">
-                            Cyno Jammer
+                            Tenebrex Cyno Jammer
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Jump Gate" %}
+                    {% endif %}
+                    {% if timer.structure == "Jump Gate" or timer.structure == "Ansiblex Jump Gate" %}
                         <div class="label label-warning">
-                            Jump Gate
+                            Ansiblex Jump Gate
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Moon Mining Cycle" %}
+                    {% endif %}
+                    {% if timer.structure == "Moon Mining Cycle" %}
                         <div class="label label-success">
                             Moon Mining Cycle
                         </div>
-                    {% endifequal %}
-                    {% ifequal timer.structure "Other" %}
+                    {% endif %}
+                    {% if timer.structure == "Other" %}
                         <div class="label label-default">
                             Other
                         </div>
-                    {% endifequal %}
+                    {% endif %}
                 </td>
                 <td class="text-center" nowrap>{{ timer.eve_time | date:"Y-m-d H:i" }}</td>
                 <td class="text-center" nowrap>