diff --git a/src/Apps/StatCan.OrchardCore.Scheduling/Migrations.cs b/src/Apps/StatCan.OrchardCore.Scheduling/Migrations.cs
index fdb46c1ce..fed6b8d89 100644
--- a/src/Apps/StatCan.OrchardCore.Scheduling/Migrations.cs
+++ b/src/Apps/StatCan.OrchardCore.Scheduling/Migrations.cs
@@ -21,7 +21,7 @@ public async Task<int> CreateAsync()
         {
             await _recipeMigrator.ExecuteAsync("initial.recipe.json", this);
             _contentDefinitionManager.AlterTypeDefinition("Taxonomy", t=>t.Securable());
-            return 2;
+            return 3;
         }
         public async Task<int> UpdateFrom1Async()
         {
@@ -30,5 +30,11 @@ public async Task<int> UpdateFrom1Async()
             _contentDefinitionManager.AlterTypeDefinition("Taxonomy", t=>t.Securable());
             return 2;
         }
+        public async Task<int> UpdateFrom2Async()
+        {
+            // re-run the recipe for existing deployments
+            await _recipeMigrator.ExecuteAsync("initial.recipe.json", this);
+            return 3;
+        }
     }
 }
diff --git a/src/Apps/StatCan.OrchardCore.Scheduling/Migrations/initial.recipe.json b/src/Apps/StatCan.OrchardCore.Scheduling/Migrations/initial.recipe.json
index e06c791cf..b52e693ef 100644
--- a/src/Apps/StatCan.OrchardCore.Scheduling/Migrations/initial.recipe.json
+++ b/src/Apps/StatCan.OrchardCore.Scheduling/Migrations/initial.recipe.json
@@ -142,6 +142,27 @@
               }
             }
           ]
+        },
+        {
+          "Name": "CalendarSettings",
+          "DisplayName": "Calendar Settings",
+          "Settings": {
+            "ContentTypeSettings": {
+              "Stereotype": "CustomSettings"
+            },
+            "FullTextAspectSettings": {}
+          },
+          "ContentTypePartDefinitionRecords": [
+            {
+              "PartName": "CalendarSettings",
+              "Name": "CalendarSettings",
+              "Settings": {
+                "ContentTypePartSettings": {
+                  "Position": "0"
+                }
+              }
+            }
+          ]
         }
       ],
       "ContentParts": [
@@ -292,7 +313,7 @@
               "Settings": {
                 "ContentPartFieldSettings": {
                   "DisplayName": "FirstName",
-                  "Position": "2"
+                  "Position": "1"
                 }
               }
             },
@@ -302,7 +323,7 @@
               "Settings": {
                 "ContentPartFieldSettings": {
                   "DisplayName": "Last Name",
-                  "Position": "3"
+                  "Position": "2"
                 }
               }
             },
@@ -312,7 +333,7 @@
               "Settings": {
                 "ContentPartFieldSettings": {
                   "DisplayName": "Consent",
-                  "Position": "5"
+                  "Position": "4"
                 },
                 "BooleanFieldSettings": {
                   "Hint": "Consent form has been signed by the employee"
@@ -326,7 +347,7 @@
               "Settings": {
                 "ContentPartFieldSettings": {
                   "DisplayName": "Participating",
-                  "Position": "4"
+                  "Position": "3"
                 },
                 "BooleanFieldSettings": {
                   "Hint": "The employee is participating in the testing"
@@ -348,41 +369,57 @@
               }
             }
           ]
+        },
+        {
+          "Name": "CalendarSettings",
+          "Settings": {},
+          "ContentPartFieldDefinitionRecords": [
+            {
+              "FieldName": "TextField",
+              "Name": "FirstTime",
+              "Settings": {
+                "ContentPartFieldSettings": {
+                  "DisplayName": "First Time",
+                  "Position": "0"
+                },
+                "TextFieldSettings": {
+                  "Hint": "First time displayed in the calendar HH:mm format. See https://vuetifyjs.com/en/api/v-calendar/#props-first-time "
+                }
+              }
+            },
+            {
+              "FieldName": "TextField",
+              "Name": "IntervalCount",
+              "Settings": {
+                "ContentPartFieldSettings": {
+                  "DisplayName": "Interval Count",
+                  "Position": "1"
+                },
+                "TextFieldSettings": {
+                  "Hint": "The number of intervals to display. https://vuetifyjs.com/en/api/v-calendar/#props-interval-count "
+                }
+              }
+            },
+            {
+              "FieldName": "TextField",
+              "Name": "IntervalMinutes",
+              "Settings": {
+                "ContentPartFieldSettings": {
+                  "DisplayName": "Interval Minutes",
+                  "Position": "2"
+                },
+                "TextFieldSettings": {
+                  "Hint": "The number of minutes the intervals are. \r\nhttps://vuetifyjs.com/en/api/v-calendar/#props-interval-minutes"
+                }
+              }
+            }
+          ]
         }
       ]
     },
     {
       "name": "content",
       "data": [
-        {
-          "ContentItemId": "4wnw5cysybe8szzhehezz5b74b",
-          "ContentItemVersionId": "42p43tpp922cn31wpfadcwxtn1",
-          "ContentType": "Taxonomy",
-          "DisplayText": "Calendars",
-          "Latest": true,
-          "Published": true,
-          "ModifiedUtc": "2021-05-18T17:22:49.2243686Z",
-          "PublishedUtc": "2021-05-18T17:22:49.2316346Z",
-          "CreatedUtc": "2021-05-18T17:04:12.2054281Z",
-          "TitlePart": {
-            "Title": "Calendars"
-          },
-          "AliasPart": {
-            "Alias": "calendars"
-          },
-          "AutoroutePart": {
-            "Path": "calendars",
-            "SetHomepage": false,
-            "Disabled": false,
-            "RouteContainedItems": true,
-            "Absolute": false
-          },
-          "TaxonomyPart": {
-            "Terms": [
-            ],
-            "TermContentType": "AppointmentCalendar"
-          }
-        },
         {
           "ContentItemId": "4gbw4m0mz1sh45v9f2ztznktnw",
           "ContentItemVersionId": "41eytr03g1z67zp0d627pr4b58",
@@ -544,6 +581,72 @@
               }
             ]
           }
+        },
+        {
+          "ContentItemId": "4wnw5cysybe8szzhehezz5b74b",
+          "ContentItemVersionId": "470gbw6nd2cqzrtc4mcs37dac2",
+          "ContentType": "Taxonomy",
+          "DisplayText": "Calendars",
+          "Latest": true,
+          "Published": true,
+          "ModifiedUtc": "2021-05-20T19:06:47.9459677Z",
+          "PublishedUtc": "2021-05-20T19:06:47.9505872Z",
+          "CreatedUtc": "2021-05-18T17:04:12.2054281Z",
+          "Owner": null,
+          "Author": "scheduler",
+          "TitlePart": {
+            "Title": "Calendars"
+          },
+          "AliasPart": {
+            "Alias": "calendars"
+          },
+          "AutoroutePart": {
+            "Path": "calendars",
+            "SetHomepage": false,
+            "Disabled": false,
+            "RouteContainedItems": true,
+            "Absolute": false
+          },
+          "TaxonomyPart": {
+            "Terms": [
+              {
+                "ContentItemId": "4qb36abcfn35004p3fsrcwned3",
+                "ContentItemVersionId": null,
+                "ContentType": "AppointmentCalendar",
+                "DisplayText": "Default",
+                "Latest": false,
+                "Published": false,
+                "ModifiedUtc": "2021-05-20T12:57:31.9350107Z",
+                "PublishedUtc": null,
+                "CreatedUtc": null,
+                "Owner": null,
+                "Author": "admin",
+                "AppointmentCalendar": {
+                  "Color": {
+                    "Text": "#8b1313"
+                  }
+                },
+                "TitlePart": {
+                  "Title": "Default"
+                },
+                "AutoroutePart": {
+                  "Path": "default",
+                  "SetHomepage": true,
+                  "Disabled": false,
+                  "RouteContainedItems": false,
+                  "Absolute": false
+                },
+                "TermPart": {
+                  "TaxonomyContentItemId": "4wnw5cysybe8szzhehezz5b74b"
+                },
+                "@WeldedPartSettings": {
+                  "TermPart": {}
+                },
+                "Terms": []
+              }
+            ],
+            "TermContentType": "AppointmentCalendar"
+          }
         }
       ]
     },
diff --git a/src/Apps/StatCan.OrchardCore.Scheduling/Views/Calendar.liquid b/src/Apps/StatCan.OrchardCore.Scheduling/Views/Calendar.liquid
index af08fae5e..63f461bae 100644
--- a/src/Apps/StatCan.OrchardCore.Scheduling/Views/Calendar.liquid
+++ b/src/Apps/StatCan.OrchardCore.Scheduling/Views/Calendar.liquid
@@ -42,39 +42,21 @@
   <v-container>
     <v-row>
       <v-col cols="12" lg="8">
-        <v-toolbar
-                   flat
-                   >
+        <v-toolbar flat>
           <v-toolbar-title class="text-h6">
             {{ Model.PageTitle}}
           </v-toolbar-title>
           <v-spacer></v-spacer>
-          <v-btn 
-                 outlined 
-                 color="grey darken-2"
-                 :href="printUrl">
+          <v-btn outlined color="grey darken-2" :href="printUrl">
             {{ "Print" | t }}
           </v-btn>
         </v-toolbar>
         <v-sheet height="64">
-            <v-toolbar
-              flat
-            >
-              <v-btn
-                outlined
-                class="mr-4"
-                color="grey darken-2"
-                @click="setToday"
-              >
+            <v-toolbar flat>
+              <v-btn outlined class="mr-4" color="grey darken-2" @click="setToday">
                 {{ "Today" | t }}
               </v-btn>
-              <v-btn
-                fab
-                text
-                small
-                color="grey darken-2"
-                @click="prev"
-              >
+              <v-btn fab text small color="grey darken-2" @click="prev"              >
                 <v-icon small>
                   mdi-chevron-left
                 </v-icon>
@@ -84,29 +66,14 @@
                 {% raw %}{{ $refs.calendar.title }}{% endraw %}
               </v-toolbar-title>
               <v-spacer></v-spacer>
-              <v-btn
-                class="mr-4"
-                fab
-                text
-                small
-                color="grey darken-2"
-                @click="next"
-              >
+              <v-btn class="mr-4" fab text small color="grey darken-2" @click="next">
                 <v-icon small>
                   mdi-chevron-right
                 </v-icon>
               </v-btn>
-              <v-menu
-                  bottom
-                  right
-                  >
+              <v-menu bottom right>
                 <template v-slot:activator="{ on, attrs }">
-                  <v-btn
-                         outlined
-                         color="grey darken-2"
-                         v-bind="attrs"
-                         v-on="on"
-                         >
+                  <v-btn outlined color="grey darken-2" v-bind="attrs" v-on="on">
                     <span v-if="type == 'day'">{{ "Day" | t }}</span>
                     <span v-if="type == 'week'">{{ "Week" | t }}</span>
                     <span v-if="type == 'month'">{{ "Month" | t }}</span>
@@ -137,11 +104,11 @@
           <v-calendar
               ref="calendar"
               v-model="focus"
-              first-time="11:00"
+              first-time="{{ Site.Properties.CalendarSettings.CalendarSettings.FirstTime.Text | default: '8:00' }}"
               event-overlap-mode="column"
-              :event-overlap-threshold="10"
-              :interval-count="60"
-              :interval-minutes="10"
+              :event-overlap-threshold="{{ Site.Properties.CalendarSettings.CalendarSettings.IntervalMinutes.Text | default: '10' }}"
+              :interval-count="{{ Site.Properties.CalendarSettings.CalendarSettings.IntervalCount.Text | default: '54' }}"
+              :interval-minutes="{{ Site.Properties.CalendarSettings.CalendarSettings.IntervalMinutes.Text | default: '10' }}"
               color="primary"
               :events="events"
               :event-color="getEventColor"
@@ -169,41 +136,19 @@
               <span v-html="event.name"></span>{%raw%} - {{timeSummary()}}{%endraw%}
             </template>
             <template v-slot:day-body="{ date, week }">
-              <div
-                class="v-current-time"
-                :class="{ first: date === week[0].date }"
-                :style="{ top: nowY }"
-                ></div>
+              <div class="v-current-time" :class="{ first: date === week[0].date }" :style="{ top: nowY }"></div>
             </template>
           </v-calendar>
-          <v-dialog
-              v-model="createdOpen"
-              :close-on-content-click="false"
-              offset-x
-              max-width="400"
-            >
+          <v-dialog v-model="createdOpen" :close-on-content-click="false" offset-x max-width="400">
             {%- comment -%}This should be injected via settings maybe?{%- endcomment -%}
             {% assign scheduleForm = Content.ContentItemId["4gbw4m0mz1sh45v9f2ztznktnw"] %}
             {{ scheduleForm | shape_build_display | shape_properties: currentUrl: Model.CurrentUrl, employees: Model.Employees, calendarTitle: Model.ContentItem.DisplayText | shape_render }}
           </v-dialog>
-          <v-menu
-            v-model="selectedOpen"
-            :activator="selectedElement"
-            :close-on-content-click="false"
-            offset-x
-          >
-            <v-card
-              color="grey lighten-4"
-              min-width="400"
-              flat
-            >
+          <v-menu v-model="selectedOpen" :activator="selectedElement" :close-on-content-click="false" offset-x>
+            <v-card color="grey lighten-4" min-width="400" flat            >
               <v-card-title>
                 <span v-html="selectedEvent.name"></span>
-                <v-btn
-                  icon
-                  color="selectedEvent.color"
-                  :href="selectedEvent.employeeUrl"
-                >
+                <v-btn icon color="selectedEvent.color" :href="selectedEvent.employeeUrl">
                   <v-icon>mdi-pencil</v-icon>
                 </v-btn>
               </v-card-title>
@@ -221,11 +166,7 @@
                 </v-row>
               </v-card-text>
               <v-card-actions>
-                <v-btn
-                  text
-                  color="secondary"
-                  @click="selectedOpen = false"
-                >
+                <v-btn text color="secondary" @click="selectedOpen = false">
                   {{ "Close" | t }}
                 </v-btn>
                 <v-spacer></v-spacer>
@@ -240,18 +181,12 @@
       <v-col cols="12" lg="4">
         <v-toolbar flat></v-toolbar>
         <v-sheet height="64">
-          <v-toolbar
-              flat
-            >
+          <v-toolbar flat>
               <v-toolbar-title>
                 {{ "Employees" | t }}
               </v-toolbar-title>
               <v-spacer></v-spacer>
-              <v-btn
-                class="ml-auto"
-                outlined
-                href="{{ '~/Admin/Contents/ContentTypes/Employee/Create?returnUrl=' | append: Model.CurrentUrl | href }}"     
-              >
+              <v-btn class="ml-auto" outlined href="{{ '~/Admin/Contents/ContentTypes/Employee/Create?returnUrl=' | append: Model.CurrentUrl | href }}">
                 <v-icon>
                   mdi-plus
                 </v-icon>