diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index d327db0f..82e740c8 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -348,7 +348,7 @@ const actions = {
   },
 
   showToast (_, payload) {
-    FtToastEvents.$emit('toast.open', payload.message, payload.action, payload.time)
+    FtToastEvents.$emit('toast-open', payload.message, payload.action, payload.time)
   }
 }
 
diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index 7ac79dcd..d2346125 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -467,12 +467,12 @@ a:visited {
 
 ::-webkit-scrollbar {
 	width: 6px;
+  height: 6px;
 }
 
 ::-webkit-scrollbar-thumb {
   background: var(--scrollbar-color);
   border-radius: 6px;
-  height: 6px;
 }
 
 ::-webkit-scrollbar-thumb:hover {
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index f947328a..31e8e5ab 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -30,6 +30,10 @@ export default Vue.extend({
     'watch-video-playlist': WatchVideoPlaylist,
     'watch-video-recommendations': WatchVideoRecommendations
   },
+  beforeRouteLeave: function (to, from, next) {
+    this.handleRouteChange()
+    next()
+  },
   data: function() {
     return {
       isLoading: false,
@@ -883,9 +887,5 @@ export default Vue.extend({
       'updateHistory',
       'updateWatchProgress'
     ])
-  },
-  beforeRouteLeave: function (to, from, next) {
-    this.handleRouteChange()
-    next()
   }
 })
diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue
index 4b027a01..767935a0 100644
--- a/src/renderer/views/Watch/Watch.vue
+++ b/src/renderer/views/Watch/Watch.vue
@@ -77,7 +77,7 @@
         :is-upcoming="isUpcoming"
         class="watchVideo"
         :class="{ theatreWatchVideo: useTheatreMode }"
-        @theatreMode="toggleTheatreMode"
+        @theatre-mode="toggleTheatreMode"
       />
       <watch-video-description
         v-if="!isLoading"
@@ -86,14 +86,14 @@
         :description-html="videoDescriptionHtml"
         class="watchVideo"
         :class="{ theatreWatchVideo: useTheatreMode }"
-        @timestampEvent="changeTimestamp"
+        @timestamp-event="changeTimestamp"
       />
       <watch-video-comments
         v-if="!isLoading && !isLive"
         :id="videoId"
         class="watchVideo"
         :class="{ theatreWatchVideo: useTheatreMode }"
-        @timestampEvent="changeTimestamp"
+        @timestamp-event="changeTimestamp"
       />
     </div>
     <div class="sidebarArea">