diff --git a/src/App.vue b/src/App.vue
index 90dcc399..87ab0470 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,7 +12,7 @@ div#wrapper(v-if="loaded")
   aw-footer
 </template>
 
-<script>
+<script lang="ts">
 import { useSettingsStore } from '~/stores/settings';
 import { useServerStore } from '~/stores/server';
 
diff --git a/src/views/Alerts.vue b/src/views/Alerts.vue
index 54304630..f5d2fc93 100644
--- a/src/views/Alerts.vue
+++ b/src/views/Alerts.vue
@@ -54,7 +54,7 @@ div
 
 <style scoped lang="scss"></style>
 
-<script>
+<script lang="ts">
 import _ from 'lodash';
 import moment from 'moment';
 import { canonicalEvents } from '~/queries';
@@ -108,7 +108,7 @@ export default {
         let time = 0;
         _.map(Object.entries(this.alert_times), ([c, t]) => {
           if (c.startsWith(cat.join(','))) {
-            time += t;
+            if (typeof t === 'number') time += t;
           }
         });
         return time;
@@ -149,8 +149,8 @@ export default {
         bid_window: 'aw-watcher-window_' + this.hostname,
         bid_afk: 'aw-watcher-afk_' + this.hostname,
         filter_afk: this.filter_afk,
-        classes: useCategoryStore().classes_for_query,
-        filter_classes: null, // classes.map(c => c[0]),
+        categories: useCategoryStore().classes_for_query,
+        filter_categories: null, // classes.map(c => c[0]),
       });
       query += '; RETURN = events;';
 
diff --git a/src/views/Bucket.vue b/src/views/Bucket.vue
index 25fd5d88..4d7d9ad5 100644
--- a/src/views/Bucket.vue
+++ b/src/views/Bucket.vue
@@ -33,7 +33,7 @@ div
   aw-eventlist(:bucket_id="id", @save="updateEvent", :events="events" editable=true)
 </template>
 
-<script>
+<script lang="ts">
 import { useBucketsStore } from '~/stores/buckets';
 import { getClient } from '~/util/awclient';
 
diff --git a/src/views/Home.vue b/src/views/Home.vue
index f8f11f9b..eb6afdd7 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -69,7 +69,7 @@ div
 
 </template>
 
-<script>
+<script lang="ts">
 export default {
   name: 'Home',
 };
diff --git a/src/views/NotFound.vue b/src/views/NotFound.vue
index fa36c6db..6082e98e 100644
--- a/src/views/NotFound.vue
+++ b/src/views/NotFound.vue
@@ -5,7 +5,7 @@ div
     | Try navigating back where you came from.
 </template>
 
-<script>
+<script lang="ts">
 export default {
   name: 'NotFound',
 };
diff --git a/src/views/QueryExplorer.vue b/src/views/QueryExplorer.vue
index ef351579..c4222e5e 100644
--- a/src/views/QueryExplorer.vue
+++ b/src/views/QueryExplorer.vue
@@ -34,7 +34,7 @@ div
 
 <style scoped lang="scss"></style>
 
-<script>
+<script lang="ts">
 import moment from 'moment';
 import _ from 'lodash';
 import { useCategoryStore } from '~/stores/categories';
diff --git a/src/views/Stopwatch.vue b/src/views/Stopwatch.vue
index ef1e4faf..43464ce2 100644
--- a/src/views/Stopwatch.vue
+++ b/src/views/Stopwatch.vue
@@ -54,7 +54,7 @@ div
 }
 </style>
 
-<script>
+<script lang="ts">
 import _ from 'lodash';
 import moment from 'moment';
 
diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue
index 228588c6..077367e2 100644
--- a/src/views/Timeline.vue
+++ b/src/views/Timeline.vue
@@ -39,7 +39,7 @@ div
     h1.aw-loading Loading...
 </template>
 
-<script>
+<script lang="ts">
 import _ from 'lodash';
 import { useSettingsStore } from '~/stores/settings';
 import { useBucketsStore } from '~/stores/buckets';
diff --git a/src/views/activity/ActivityView.vue b/src/views/activity/ActivityView.vue
index 85cb91b0..268c8d40 100644
--- a/src/views/activity/ActivityView.vue
+++ b/src/views/activity/ActivityView.vue
@@ -31,7 +31,7 @@ div(v-if="view")
       span Edit view
 </template>
 
-<script>
+<script lang="ts">
 import 'vue-awesome/icons/save';
 import 'vue-awesome/icons/times';
 import 'vue-awesome/icons/trash';
@@ -40,7 +40,7 @@ import 'vue-awesome/icons/undo';
 import { mapState } from 'pinia';
 import draggable from 'vuedraggable';
 
-import { useViewsStore } from '@/stores/views';
+import { useViewsStore } from '~/stores/views';
 
 export default {
   name: 'ActivityView',
diff --git a/src/views/settings/ActivePatternSettings.vue b/src/views/settings/ActivePatternSettings.vue
index e6bac8fa..c02b2f97 100644
--- a/src/views/settings/ActivePatternSettings.vue
+++ b/src/views/settings/ActivePatternSettings.vue
@@ -22,7 +22,7 @@ div
 
 </template>
 
-<script>
+<script lang="ts">
 import { isRegexBroad, validateRegex } from '~/util/validate';
 import { useSettingsStore } from '~/stores/settings';
 
diff --git a/src/views/settings/CategorizationSettings.vue b/src/views/settings/CategorizationSettings.vue
index 818c7179..31219184 100644
--- a/src/views/settings/CategorizationSettings.vue
+++ b/src/views/settings/CategorizationSettings.vue
@@ -39,7 +39,7 @@ div
       b-btn.float-right(@click="saveClasses", variant="success" :disabled="!classes_unsaved_changes")
         | Save
 </template>
-<script>
+<script lang="ts">
 import { mapState, mapGetters } from 'pinia';
 import CategoryEditTree from '~/components/CategoryEditTree.vue';
 import CategoryEditModal from '~/components/CategoryEditModal.vue';
diff --git a/src/views/settings/ColorSettings.vue b/src/views/settings/ColorSettings.vue
index dfde4a8d..e5fff94a 100644
--- a/src/views/settings/ColorSettings.vue
+++ b/src/views/settings/ColorSettings.vue
@@ -8,7 +8,7 @@ div.d-flex.justify-content-between
     b-form-checkbox(v-model="useColorFallback", switch)
 </template>
 
-<script>
+<script lang="ts">
 import { useSettingsStore } from '~/stores/settings';
 
 export default {
diff --git a/src/views/settings/DaystartSettings.vue b/src/views/settings/DaystartSettings.vue
index a58b70e5..61c96510 100644
--- a/src/views/settings/DaystartSettings.vue
+++ b/src/views/settings/DaystartSettings.vue
@@ -17,7 +17,7 @@ div
   small
     | The weekday which starts a new week.
 </template>
-<script>
+<script lang="ts">
 import { useSettingsStore } from '~/stores/settings';
 
 export default {
diff --git a/src/views/settings/DeveloperSettings.vue b/src/views/settings/DeveloperSettings.vue
index 5226057c..95460bfd 100644
--- a/src/views/settings/DeveloperSettings.vue
+++ b/src/views/settings/DeveloperSettings.vue
@@ -23,7 +23,7 @@ div
     | Web UI commit hash: {{ COMMIT_HASH }}
 </template>
 
-<script>
+<script lang="ts">
 import { useSettingsStore } from '~/stores/settings';
 
 export default {
diff --git a/src/views/settings/LandingPageSettings.vue b/src/views/settings/LandingPageSettings.vue
index 97da8bda..9aca9338 100644
--- a/src/views/settings/LandingPageSettings.vue
+++ b/src/views/settings/LandingPageSettings.vue
@@ -14,7 +14,7 @@ div
     | The page to open when opening ActivityWatch, or clicking the logo in the top menu.
 </template>
 
-<script>
+<script lang="ts">
 import { useSettingsStore } from '~/stores/settings';
 import { useBucketsStore } from '~/stores/buckets';
 
diff --git a/src/views/settings/ReleaseNotificationSettings.vue b/src/views/settings/ReleaseNotificationSettings.vue
index 71907637..2a324c00 100644
--- a/src/views/settings/ReleaseNotificationSettings.vue
+++ b/src/views/settings/ReleaseNotificationSettings.vue
@@ -9,7 +9,7 @@ div
     | We will send you a notification if there is a new release available for download, this check will happen at most once per day.
 </template>
 
-<script>
+<script lang="ts">
 import { useSettingsStore } from '~/stores/settings';
 
 export default {
diff --git a/src/views/settings/Settings.vue b/src/views/settings/Settings.vue
index 2617273e..657a5881 100644
--- a/src/views/settings/Settings.vue
+++ b/src/views/settings/Settings.vue
@@ -39,7 +39,7 @@ div
   DeveloperSettings
 </template>
 
-<script>
+<script lang="ts">
 import { useSettingsStore } from '~/stores/settings';
 
 import DaystartSettings from '~/views/settings/DaystartSettings.vue';
diff --git a/src/views/settings/Theme.vue b/src/views/settings/Theme.vue
index 64dca7a2..e41a63ab 100644
--- a/src/views/settings/Theme.vue
+++ b/src/views/settings/Theme.vue
@@ -13,7 +13,7 @@ div
     | Change color theme of the application (you need to change categories colors manually to be suitable with dark mode).
 </template>
 
-<script>
+<script lang="ts">
 import { mapState } from 'pinia';
 import { useSettingsStore } from '~/stores/settings';
 
diff --git a/src/views/settings/TimelineDurationSettings.vue b/src/views/settings/TimelineDurationSettings.vue
index 46a2bf63..d9b6c320 100644
--- a/src/views/settings/TimelineDurationSettings.vue
+++ b/src/views/settings/TimelineDurationSettings.vue
@@ -16,7 +16,7 @@ div
   small
     | The default duration used for 'show last' in the timeline view.
 </template>
-<script>
+<script lang="ts">
 import { useSettingsStore } from '~/stores/settings';
 
 export default {