diff --git a/rowers/mytypes.py b/rowers/mytypes.py
index 2df4c87d..f86dfc6f 100644
--- a/rowers/mytypes.py
+++ b/rowers/mytypes.py
@@ -10,6 +10,34 @@ workouttypes = (
     ('coastal','Coastal'),
     ('c-boat','Dutch C boat'),
     ('churchboat','Finnish Church boat'),
+    ('Ride','Ride'),
+    ('Kitesurf','Kitesurf'),
+    ('Run','Run'),
+    ('NordicSki','NordicSki'),
+    ('Swim','Swim'),
+    ('RockClimbing','RockClimbing'),
+    ('Hike','Hike'),
+    ('RollerSki','RollerSki'),
+    ('Walk','Walk'),
+    ('AlpineSki','AlpineSki'),
+    ('Snowboard','Snowboard'),
+    ('BackcountrySki','BackcountrySki'),
+    ('Snowshoe','Snowshoe'),
+    ('Canoeing','Canoeing'),
+    ('StairStepper','StairStepper'),
+    ('Crossfit','Crossfit'),
+    ('StandUpPaddling','StandUpPaddling'),
+    ('EBikeRide','EBikeRide'),
+    ('Surfing','Surfing'),
+    ('Elliptical','Elliptical'),
+    ('VirtualRide','VirtualRide'),
+    ('IceSkate','IceSkate'),
+    ('WeightTraining','WeightTraining'),
+    ('InlineSkate','InlineSkate'),
+    ('Windsurf','Windsurf'),
+    ('Kayaking','Kayaking'),
+    ('Workout','Workout'),
+    ('Yoga','Yoga'),
     ('other','Other'),
 )
 
@@ -20,6 +48,15 @@ otwtypes = (
     'churchboat'
     )
 
+rowtypes = (
+    'water',
+    'rower',
+    'dynamic',
+    'slides',
+    'coastal',
+    'c-boat',
+    'churchboat'
+    )
 
 
 checktypes = [i[0] for i in workouttypes]
diff --git a/rowers/templates/document_form.html b/rowers/templates/document_form.html
index 38b76235..f285de40 100644
--- a/rowers/templates/document_form.html
+++ b/rowers/templates/document_form.html
@@ -83,18 +83,15 @@
 $( document ).ready(function() {
     $('#id_workouttype').on('change', function(){
         if (
-            $(this).val() == 'rower'
-            || $(this).val() == 'skierg'
-            || $(this).val() == 'dynamic'
-            || $(this).val() == 'slides'
-            || $(this).val() == 'paddle'
-            || $(this).val() == 'bike'
-            || $(this).val() == 'snow'
+            $(this).val() == 'water'
+            || $(this).val() == 'coastal'
+            || $(this).val() == 'c-boat'
+            || $(this).val() == 'churchboat'
         ) {
+            $('#id_boattype').toggle(true);
+        } else { 
             $('#id_boattype').toggle(false);
             $('#id_boattype').val('1x');        
-        } else { 
-            $('#id_boattype').toggle(true);
         }
 });
 $('#id_workouttype').change(); 
diff --git a/rowers/templates/manualadd.html b/rowers/templates/manualadd.html
index f1baf6f2..a70040c1 100644
--- a/rowers/templates/manualadd.html
+++ b/rowers/templates/manualadd.html
@@ -16,18 +16,15 @@
 $( document ).ready(function() {
     $('#id_workouttype').on('change', function(){
         if (
-            $(this).val() == 'rower'
-            || $(this).val() == 'skierg'
-            || $(this).val() == 'dynamic'
-            || $(this).val() == 'slides'
-            || $(this).val() == 'paddle'
-            || $(this).val() == 'bike'
-            || $(this).val() == 'snow'
+            $(this).val() == 'water'
+            || $(this).val() == 'coastal'
+            || $(this).val() == 'c-boat'
+            || $(this).val() == 'churchboat'
         ) {
+            $('#id_boattype').toggle(true);
+        } else { 
             $('#id_boattype').toggle(false);
             $('#id_boattype').val('1x');        
-        } else { 
-            $('#id_boattype').toggle(true);
         }
 });
 $('#id_workouttype').change(); 
diff --git a/rowers/templates/team_document_form.html b/rowers/templates/team_document_form.html
index 4db8e2fb..899e62da 100644
--- a/rowers/templates/team_document_form.html
+++ b/rowers/templates/team_document_form.html
@@ -76,25 +76,22 @@
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
 <script>
-  $( document ).ready(function() {
-  $('#id_workouttype').on('change', function(){
-  if (
-  $(this).val() == 'rower'
-  || $(this).val() == 'skierg'
-  || $(this).val() == 'dynamic'
-  || $(this).val() == 'slides'
-  || $(this).val() == 'paddle'
-  || $(this).val() == 'bike'
-  || $(this).val() == 'snow'
-  ) {
-  $('#id_boattype').toggle(false);
-  $('#id_boattype').val('1x');        
-  } else { 
-  $('#id_boattype').toggle(true);
-  }
-  });
-  $('#id_workouttype').change(); 
-  });
+$( document ).ready(function() {
+    $('#id_workouttype').on('change', function(){
+        if (
+            $(this).val() == 'water'
+            || $(this).val() == 'coastal'
+            || $(this).val() == 'c-boat'
+            || $(this).val() == 'churchboat'
+        ) {
+            $('#id_boattype').toggle(true);
+        } else { 
+            $('#id_boattype').toggle(false);
+            $('#id_boattype').val('1x');        
+        }
+});
+$('#id_workouttype').change(); 
+});
 
 </script>
 {% endblock %}
diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html
index 72a8a0fe..add74b3d 100644
--- a/rowers/templates/workout_form.html
+++ b/rowers/templates/workout_form.html
@@ -23,18 +23,15 @@
 $( document ).ready(function() {
     $('#id_workouttype').on('change', function(){
         if (
-            $(this).val() == 'rower'
-            || $(this).val() == 'skierg'
-            || $(this).val() == 'dynamic'
-            || $(this).val() == 'slides'
-            || $(this).val() == 'paddle'
-            || $(this).val() == 'snow'
-            || $(this).val() == 'bike'
+            $(this).val() == 'water'
+            || $(this).val() == 'coastal'
+            || $(this).val() == 'c-boat'
+            || $(this).val() == 'churchboat'
         ) {
+            $('#id_boattype').toggle(true);
+        } else { 
             $('#id_boattype').toggle(false);
             $('#id_boattype').val('1x');        
-        } else { 
-            $('#id_boattype').toggle(true);
         }
 });
 $('#id_workouttype').change();