diff --git a/.gitignore b/.gitignore
index f0f5f3d..ec32aa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.sln.docstates
 
 # Tubio files
+/Tubio/Tubio
 config.json
 log.txt
 log.json
@@ -28,6 +29,7 @@ ffprobe.exe
 mono_crash.*
 
 # Build results
+build/
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
@@ -371,4 +373,4 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
\ No newline at end of file
+FodyWeavers.xsd
diff --git a/Tubio/CMakeLists.txt b/Tubio/CMakeLists.txt
new file mode 100755
index 0000000..5503758
--- /dev/null
+++ b/Tubio/CMakeLists.txt
@@ -0,0 +1,49 @@
+cmake_minimum_required(VERSION 3.16)
+project(Tubio)
+
+# Set C++ standard
+set(CMAKE_CXX_STANDARD 17)
+
+# Add StringTools src dir to include dir list
+include_directories(./external_dependencies/)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+
+# Add absolutely kawaii sources to Tubio <3
+add_executable(Tubio
+        main.cpp
+        ConsoleManager.cpp
+        ConsoleManager.h
+        DownloadManager.cpp
+        DownloadManager.h
+        FileSystem.cpp
+        FileSystem.h
+        Framework.cpp
+        Framework.h
+        HttpServer.cpp
+        HttpServer.h
+        Idler.cpp
+        Idler.h
+        LogHistory.cpp
+        LogHistory.h
+        LogTypes.h
+        Logger.cpp
+        Logger.h
+        RestQueryHandler.cpp
+        RestQueryHandler.h
+        RestResponseTemplates.cpp
+        RestResponseTemplates.h
+        TimeUnits.h
+        Updater.cpp
+        Updater.h
+        Version.h
+        XGConfig.cpp
+        XGConfig.h
+        XGControl.cpp
+        XGControl.h
+        external_dependencies/casenta/mongoose/mongoose.c
+        external_dependencies/casenta/mongoose/mongoose.h
+        external_dependencies/leonetienne/JasonPP/JasonPP.hpp
+        external_dependencies/leonetienne/JasonPP/JasonPP.cpp
+)
+
diff --git a/Tubio/FileSystem.cpp b/Tubio/FileSystem.cpp
index 446f13a..8bd29b4 100644
--- a/Tubio/FileSystem.cpp
+++ b/Tubio/FileSystem.cpp
@@ -1,4 +1,4 @@
-#include "Filesystem.h"
+#include "FileSystem.h"
 #ifdef _WIN
 #include <Windows.h>
 #endif
diff --git a/Tubio/XGConfig.h b/Tubio/XGConfig.h
index c2c8248..84aa4db 100644
--- a/Tubio/XGConfig.h
+++ b/Tubio/XGConfig.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <vector>
-#include "Filesystem.h"
+#include "FileSystem.h"
 #include "external_dependencies/leonetienne/JasonPP/JasonPP.hpp"
 #include "Logger.h"
 
diff --git a/Tubio/yt-dlp.exe b/Tubio/yt-dlp.exe
deleted file mode 100644
index 870e2f7..0000000
Binary files a/Tubio/yt-dlp.exe and /dev/null differ
diff --git a/linux_build/build.sh b/linux_build/build.sh
deleted file mode 100644
index a957f18..0000000
--- a/linux_build/build.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-g++ \
-\
--std=c++17 \
-\
--D __linux__ \
--D JASONPP_RENDER_SORTED \
-\
-../Tubio/main.cpp \
-../Tubio/ConsoleManager.cpp \
-../Tubio/DownloadManager.cpp \
-../Tubio/FileSystem.cpp \
-../Tubio/Framework.cpp \
-../Tubio/HttpServer.cpp \
-../Tubio/Logger.cpp \
-../Tubio/LogHistory.cpp \
-../Tubio/RestQueryHandler.cpp \
-../Tubio/RestResponseTemplates.cpp \
-../Tubio/XGConfig.cpp \
-../Tubio/XGControl.cpp \
-../Tubio/Updater.cpp \
-../Tubio/Idler.cpp \
-\
-\
-../Tubio/external_dependencies/casenta/mongoose/mongoose.c \
-../Tubio/external_dependencies/leonetienne/JasonPP/JasonPP.cpp \
-\
--lpthread \
-\
--Wall \
--o ./tubio.out
diff --git a/linux_build/tubio.out b/linux_build/tubio.out
deleted file mode 100644
index 4d40e80..0000000
Binary files a/linux_build/tubio.out and /dev/null differ