diff --git a/src/components/Player.vue b/src/components/Player.vue
new file mode 100644
index 00000000..04261f95
--- /dev/null
+++ b/src/components/Player.vue
@@ -0,0 +1,141 @@
+<template>
+    <div class="uk-container-expand">
+        <div data-shaka-player-container>
+            <video
+                data-shaka-player
+                autoplay
+                style="width: 100%; height: 100%"
+            ></video>
+        </div>
+    </div>
+</template>
+
+<script>
+import("shaka-player/dist/controls.css");
+const shaka = import("shaka-player/dist/shaka-player.ui.js");
+
+export default {
+    props: {
+        video: Object,
+        sponsors: Object,
+        selectedAutoPlay: Boolean
+    },
+    methods: {
+        loadVideo() {
+            const videoEl = document.querySelector("video");
+
+            videoEl.setAttribute("poster", this.video.thumbnailUrl);
+
+            if (this.$route.query.t) videoEl.currentTime = this.$route.query.t;
+
+            const noPrevPlayer = !this.player;
+
+            var streams = [];
+
+            streams.push(...this.video.audioStreams);
+            streams.push(...this.video.videoStreams);
+
+            const dash = require("@/utils/DashUtils.js").default.generate_dash_file_from_formats(
+                streams,
+                this.video.duration
+            );
+
+            if (noPrevPlayer)
+                shaka
+                    .then(shaka => shaka.default)
+                    .then(shaka => {
+                        this.shaka = shaka;
+                        shaka.polyfill.installAll();
+
+                        const player = new shaka.Player(videoEl);
+
+                        this.player = player;
+
+                        this.setPlayerAttrs(player, videoEl, dash, shaka);
+                    });
+            else this.setPlayerAttrs(this.player, videoEl, dash, this.shaka);
+
+            if (noPrevPlayer) {
+                videoEl.addEventListener("timeupdate", () => {
+                    if (this.sponsors && this.sponsors.segments) {
+                        const time = videoEl.currentTime;
+                        this.sponsors.segments.map(segment => {
+                            if (!segment.skipped) {
+                                const end = segment.segment[1];
+                                if (time >= segment.segment[0] && time < end) {
+                                    console.log("Skipped segment at " + time);
+                                    videoEl.currentTime = end;
+                                    segment.skipped = true;
+                                    return;
+                                }
+                            }
+                        });
+                    }
+                });
+
+                videoEl.addEventListener("volumechange", () => {
+                    if (localStorage)
+                        localStorage.setItem("volume", videoEl.volume);
+                });
+
+                videoEl.addEventListener("ended", () => {
+                    if (
+                        this.selectedAutoPlay &&
+                        this.video.relatedStreams.length > 0
+                    )
+                        this.$router.push(this.video.relatedStreams[0].url);
+                });
+            }
+
+            //TODO: Add sponsors on seekbar: https://github.com/ajayyy/SponsorBlock/blob/e39de9fd852adb9196e0358ed827ad38d9933e29/src/js-components/previewBar.ts#L12
+        },
+        setPlayerAttrs(player, videoEl, dash, shaka) {
+            player
+                .load(
+                    "data:application/dash+xml;charset=utf-8;base64," +
+                        btoa(dash)
+                )
+                .then(() => {
+                    this.video.subtitles.map(subtitle => {
+                        player.addTextTrack(
+                            subtitle.url,
+                            "eng",
+                            "SUBTITLE",
+                            subtitle.mimeType,
+                            null,
+                            "English"
+                        );
+                        player.setTextTrackVisibility(true);
+                    });
+                    if (localStorage)
+                        videoEl.volume = localStorage.getItem("volume") || 1;
+
+                    const ui =
+                        this.ui ||
+                        (this.ui = new shaka.ui.Overlay(
+                            player,
+                            document.querySelector(
+                                "div[data-shaka-player-container]"
+                            ),
+                            videoEl
+                        ));
+
+                    const config = {
+                        overflowMenuButtons: [
+                            "quality",
+                            "captions",
+                            "playback_rate"
+                        ],
+                        seekBarColors: {
+                            base: "rgba(255, 255, 255, 0.3)",
+                            buffered: "rgba(255, 255, 255, 0.54)",
+                            played: "rgb(255, 0, 0)"
+                        }
+                    };
+
+                    ui.configure(config);
+                });
+        }
+    }
+};
+</script>
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index 547f4f1f..6de651e3 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -1,12 +1,11 @@
 <template>
     <div class="uk-container uk-container-xlarge">
-        <div data-shaka-player-container>
-            <video
-                data-shaka-player
-                autoplay
-                style="width: 100%; height: 100%"
-            ></video>
-        </div>
+        <Player
+            ref="videoPlayer"
+            :video="video"
+            :sponsors="sponsors"
+            :selectedAutoPlay="selectedAutoPlay"
+        />
         <h1 class="uk-text-bold">{{ video.title }}</h1>
 
         <img :src="video.uploaderAvatar" loading="lazy" />
@@ -79,10 +78,8 @@
 </template>
 
 <script>
-import "shaka-player/dist/shaka-player.ui.js";
-import("shaka-player/dist/controls.css");
-const shaka = import("shaka-player/dist/shaka-player.ui.js");
 import Constants from "@/Constants.js";
+import Player from "@/components/Player.vue";
 
 export default {
     name: "App",
@@ -145,51 +142,6 @@ export default {
             if (localStorage)
                 localStorage.setItem("autoplay", this.selectedAutoPlay);
         },
-        setPlayerAttrs(player, videoEl, dash, shaka) {
-            player
-                .load(
-                    "data:application/dash+xml;charset=utf-8;base64," +
-                        btoa(dash)
-                )
-                .then(() => {
-                    this.video.subtitles.map(subtitle => {
-                        player.addTextTrack(
-                            subtitle.url,
-                            "eng",
-                            "SUBTITLE",
-                            subtitle.mimeType,
-                            null,
-                            "English"
-                        );
-                        player.setTextTrackVisibility(true);
-                    });
-                    if (localStorage)
-                        videoEl.volume = localStorage.getItem("volume") || 1;
-
-                    const ui =
-                        window.ui ||
-                        (window.ui = new shaka.ui.Overlay(
-                            player,
-                            document.querySelector(
-                                "div[data-shaka-player-container]"
-                            ),
-                            videoEl
-                        ));
-                    const config = {
-                        overflowMenuButtons: [
-                            "quality",
-                            "captions",
-                            "playback_rate"
-                        ],
-                        seekBarColors: {
-                            base: "rgba(255, 255, 255, 0.3)",
-                            buffered: "rgba(255, 255, 255, 0.54)",
-                            played: "rgb(255, 0, 0)"
-                        }
-                    };
-                    ui.configure(config);
-                });
-        },
         async getVideoData() {
             this.fetchVideo()
                 .then(data => {
@@ -203,115 +155,16 @@ export default {
                         .replaceAll("https://www.youtube.com", "")
                         .replaceAll("\n", "<br>");
 
-                    const noPrevPlayer = !window.player;
-
-                    var streams = [];
-
-                    streams.push(...this.video.audioStreams);
-                    streams.push(...this.video.videoStreams);
-
-                    const dash = require("../utils/DashUtils.js").default.generate_dash_file_from_formats(
-                        streams,
-                        this.video.duration
-                    );
-
-                    const WatchVideo = this;
-
-                    const videoEl = document.querySelector("video");
-
-                    setTimeout(function() {
-                        shaka
-                            .then(shaka => shaka.default)
-                            .then(shaka => {
-                                if (noPrevPlayer) {
-                                    shaka.polyfill.installAll();
-
-                                    const player = new shaka.Player(videoEl);
-
-                                    WatchVideo.player = player;
-                                    window.player = player;
-
-                                    WatchVideo.setPlayerAttrs(
-                                        player,
-                                        videoEl,
-                                        dash,
-                                        shaka
-                                    );
-                                } else {
-                                    WatchVideo.setPlayerAttrs(
-                                        window.player,
-                                        videoEl,
-                                        dash,
-                                        shaka
-                                    );
-                                }
-                            });
-                    }, 0);
-
-                    videoEl.setAttribute("poster", this.video.thumbnailUrl);
-
-                    if (this.$route.query.t)
-                        videoEl.currentTime = this.$route.query.t;
-
-                    videoEl.addEventListener("loadedmetadata", function() {
-                        const track = this.addTextTrack(
-                            "captions",
-                            "English",
-                            "en"
-                        );
-                        track.mode = "showing";
-                    });
-
-                    if (noPrevPlayer) {
-                        videoEl.addEventListener("timeupdate", () => {
-                            if (
-                                WatchVideo.sponsors &&
-                                WatchVideo.sponsors.segments
-                            ) {
-                                const time = videoEl.currentTime;
-                                WatchVideo.sponsors.segments.map(segment => {
-                                    if (!segment.skipped) {
-                                        const end = segment.segment[1];
-                                        if (
-                                            time >= segment.segment[0] &&
-                                            time < end
-                                        ) {
-                                            console.log(
-                                                "Skipped segment at " + time
-                                            );
-                                            videoEl.currentTime = end;
-                                            segment.skipped = true;
-                                            return;
-                                        }
-                                    }
-                                });
-                            }
-                        });
-
-                        videoEl.addEventListener("volumechange", () => {
-                            if (localStorage)
-                                localStorage.setItem("volume", videoEl.volume);
-                        });
-
-                        videoEl.addEventListener("ended", () => {
-                            if (
-                                WatchVideo.selectedAutoPlay &&
-                                WatchVideo.video.relatedStreams.length > 0
-                            )
-                                WatchVideo.$router.push(
-                                    WatchVideo.video.relatedStreams[0].url
-                                );
-                        });
-                    }
-
-                    //const parent = this.player.el().querySelector(".vjs-progress-holder")
-                    //TODO: Add sponsors on seekbar: https://github.com/ajayyy/SponsorBlock/blob/e39de9fd852adb9196e0358ed827ad38d9933e29/src/js-components/previewBar.ts#L12
+                    this.$refs.videoPlayer.loadVideo();
                 });
         },
         async getSponsors() {
             if (!localStorage || localStorage.getItem("sponsorblock") !== false)
                 this.fetchSponsors().then(data => (this.sponsors = data));
         }
+    },
+    components: {
+        Player
     }
 };
 </script>