diff --git a/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html b/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
index d08e3873..37accc49 100644
--- a/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
+++ b/fleetactivitytracking/templates/fleetactivitytracking/fatlinkformatter.html
@@ -6,8 +6,6 @@
 {% block title %}Alliance Auth - Fatlink Create{% endblock %}
 
 {% block page_title %}{% trans "Create Fatlink" %}{% endblock page_title %}
-{% block extra_css %}
-    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
diff --git a/stock/templates/registered/addtimer.html b/stock/templates/registered/addtimer.html
index 11b1c2e3..f42f243a 100755
--- a/stock/templates/registered/addtimer.html
+++ b/stock/templates/registered/addtimer.html
@@ -7,9 +7,6 @@
 {% block title %}{% trans "Alliance Auth - Structure Timer Create" %}{% endblock %}
 
 {% block page_title %}{% trans "Timer Create" %}{% endblock page_title %}
-{% block extra_css %}
-    {% include 'bundles/jquery-datetimepicker-css.html' %}
-{% endblock extra_css %}
 
 {% block content %}
     <div class="col-lg-12">
@@ -30,17 +27,3 @@
     </div>
 
 {% endblock content %}
-
-{% block extra_javascript %}
-    {% include 'bundles/jquery-datetimepicker-js.html' %}
-{% endblock %}
-
-{% block extra_script %}
-
-    $('#id_eve_time').datetimepicker({
-    lang: '{{ LANGUAGE_CODE }}',
-    maskInput: true,
-    format: 'Y-m-d H:i',minDate:0
-    });
-
-{% endblock extra_script %}
diff --git a/stock/templates/registered/optimerupdate.html b/stock/templates/registered/optimerupdate.html
index 318ec842..fd75a055 100755
--- a/stock/templates/registered/optimerupdate.html
+++ b/stock/templates/registered/optimerupdate.html
@@ -7,8 +7,10 @@
 {% block title %}Alliance Auth - Update Fleet Operation {% endblock %}
 
 {% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
+
 {% block extra_css %}
-    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
+    {% include 'bundles/jquery-datetimepicker-css.html' %}
+{% endblock extra_css %}
 
 {% block content %}
 
@@ -37,6 +39,10 @@
 
 {% endblock content %}
 
+{% block extra_javascript %}
+    {% include 'bundles/jquery-datetimepicker-js.html' %}
+{% endblock %}
+
 {% block extra_script %}
 
     $('#id_start').datetimepicker({
diff --git a/stock/templates/registered/srpfleetadd.html b/stock/templates/registered/srpfleetadd.html
index 71f4bc2b..39145ae5 100755
--- a/stock/templates/registered/srpfleetadd.html
+++ b/stock/templates/registered/srpfleetadd.html
@@ -7,7 +7,8 @@
 
 {% block page_title %}{% trans "SRP Fleet Create" %}{% endblock page_title %}
 {% block extra_css %}
-    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
+    {% include 'bundles/jquery-datetimepicker-css.html' %}
+{% endblock extra_css %}
 
 {% block content %}
 
@@ -40,6 +41,10 @@
 
 {% endblock content %}
 
+{% block extra_javascript %}
+    {% include 'bundles/jquery-datetimepicker-js.html' %}
+{% endblock %}
+
 {% block extra_script %}
 
     $('#id_fleet_time').datetimepicker({
diff --git a/stock/templates/registered/srpfleetrequest.html b/stock/templates/registered/srpfleetrequest.html
index 8cc91f18..c2beff83 100755
--- a/stock/templates/registered/srpfleetrequest.html
+++ b/stock/templates/registered/srpfleetrequest.html
@@ -6,8 +6,6 @@
 {% block title %}Alliance Auth - SRP Request{% endblock %}
 
 {% block page_title %}{% trans "SRP Request" %}{% endblock page_title %}
-{% block extra_css %}
-    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
 
 {% block content %}
 
@@ -42,12 +40,3 @@
     </div>
 
 {% endblock content %}
-
-{% block extra_script %}
-
-    $('#id_fleet_time').datetimepicker({
-    maskInput: true,
-    format: 'Y-m-d H:i',minDate:0
-    });
-
-{% endblock extra_script %}
diff --git a/stock/templates/registered/srpfleetrequestamount.html b/stock/templates/registered/srpfleetrequestamount.html
index 648f835f..cc1f4fe6 100755
--- a/stock/templates/registered/srpfleetrequestamount.html
+++ b/stock/templates/registered/srpfleetrequestamount.html
@@ -6,8 +6,6 @@
 {% block title %}Alliance Auth - Update SRP Amount{% endblock %}
 
 {% block page_title %}{% trans "Update SRP Amount" %}{% endblock page_title %}
-{% block extra_css %}
-    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
 
 {% block content %}
 
@@ -31,12 +29,3 @@
     </div>
 
 {% endblock content %}
-
-{% block extra_script %}
-
-    $('#id_fleet_time').datetimepicker({
-    maskInput: true,
-    format: 'Y-m-d H:i',minDate:0
-    });
-
-{% endblock extra_script %}
diff --git a/stock/templates/registered/srpfleetupdate.html b/stock/templates/registered/srpfleetupdate.html
index ef603113..207ec22e 100755
--- a/stock/templates/registered/srpfleetupdate.html
+++ b/stock/templates/registered/srpfleetupdate.html
@@ -6,8 +6,6 @@
 {% block title %}Alliance Auth - Update AAR Link{% endblock %}
 
 {% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
-{% block extra_css %}
-    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
 
 {% block content %}
 
@@ -35,12 +33,3 @@
     </div>
 
 {% endblock content %}
-
-{% block extra_script %}
-
-    $('#id_fleet_time').datetimepicker({
-    maskInput: true,
-    format: 'Y-m-d H:i',minDate:0
-    });
-
-{% endblock extra_script %}
diff --git a/stock/templates/registered/timerupdate.html b/stock/templates/registered/timerupdate.html
index bf59dc0c..11ddcdb1 100644
--- a/stock/templates/registered/timerupdate.html
+++ b/stock/templates/registered/timerupdate.html
@@ -6,8 +6,6 @@
 {% block title %}Alliance Auth - Update Structure Timer {% endblock %}
 
 {% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
-{% block extra_css %}
-    <link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
 
 {% block content %}
 
@@ -35,12 +33,3 @@
     </div>
 
 {% endblock content %}
-
-{% block extra_script %}
-
-    $('#id_fleet_time').datetimepicker({
-    maskInput: true,
-    format: 'Y-m-d H:i',minDate:0
-    });
-
-{% endblock extra_script %}