diff --git a/.gitmodules b/.gitmodules
index 1c9f0ca..5988d08 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "DesktopNotifications"]
 	path = DesktopNotifications
 	url = https://github.com/pr8x/DesktopNotifications
+[submodule "ScreenCapture.NET"]
+	path = ScreenCapture.NET
+	url = https://github.com/MakesYT/ScreenCapture.NET.git
diff --git a/Kitopia.sln b/Kitopia.sln
index 5cd5232..5d34050 100644
--- a/Kitopia.sln
+++ b/Kitopia.sln
@@ -34,13 +34,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Window", "Core.Window\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Linux", "Core.Linux\Core.Linux.csproj", "{88621E02-A1A5-4896-A43C-B536803C1AFE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenCapture.NET", "..\ScreenCapture.NET\ScreenCapture.NET\ScreenCapture.NET.csproj", "{2141ACC1-926B-4BE0-921C-E339A6B34F11}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenCapture.NET.DX11", "..\ScreenCapture.NET\ScreenCapture.NET.DX11\ScreenCapture.NET.DX11.csproj", "{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}"
-EndProject
 
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "kitopia", "build\kitopia.csproj", "{4698A8B2-97C4-4B97-BF66-C12F9EAFC964}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenCapture.NET.DX11", "ScreenCapture.NET\ScreenCapture.NET.DX11\ScreenCapture.NET.DX11.csproj", "{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenCapture.NET", "ScreenCapture.NET\ScreenCapture.NET\ScreenCapture.NET.csproj", "{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -437,46 +437,46 @@ Global
 		{88621E02-A1A5-4896-A43C-B536803C1AFE}.Release|x64.Build.0 = Release|Any CPU
 		{88621E02-A1A5-4896-A43C-B536803C1AFE}.Release|x86.ActiveCfg = Release|Any CPU
 		{88621E02-A1A5-4896-A43C-B536803C1AFE}.Release|x86.Build.0 = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|ARM.Build.0 = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|x64.Build.0 = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Debug|x86.Build.0 = Debug|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|ARM.Build.0 = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|arm64.Build.0 = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|x64.ActiveCfg = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|x64.Build.0 = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|x86.ActiveCfg = Release|Any CPU
-		{2141ACC1-926B-4BE0-921C-E339A6B34F11}.Release|x86.Build.0 = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|arm64.Build.0 = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|x64.Build.0 = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Debug|x86.Build.0 = Debug|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|ARM.Build.0 = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|arm64.ActiveCfg = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|arm64.Build.0 = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|x64.ActiveCfg = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|x64.Build.0 = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|x86.ActiveCfg = Release|Any CPU
-		{0B5FB1A2-4A50-4B10-909B-9ADEE1123B8C}.Release|x86.Build.0 = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|arm64.Build.0 = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|x64.Build.0 = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Debug|x86.Build.0 = Debug|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|ARM.Build.0 = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|arm64.ActiveCfg = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|arm64.Build.0 = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|x64.ActiveCfg = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|x64.Build.0 = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|x86.ActiveCfg = Release|Any CPU
+		{B2C2C0E7-E288-4B05-AE54-81D3B75ACEFF}.Release|x86.Build.0 = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|ARM.Build.0 = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|arm64.Build.0 = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|x64.Build.0 = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Debug|x86.Build.0 = Debug|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|ARM.ActiveCfg = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|ARM.Build.0 = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|arm64.ActiveCfg = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|arm64.Build.0 = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|x64.ActiveCfg = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|x64.Build.0 = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|x86.ActiveCfg = Release|Any CPU
+		{62CAA554-A70A-42F8-89DA-0FEAB9BDA965}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ScreenCapture.NET b/ScreenCapture.NET
new file mode 160000
index 0000000..6ab24f1
--- /dev/null
+++ b/ScreenCapture.NET
@@ -0,0 +1 @@
+Subproject commit 6ab24f1b3058fd5cc8c373a2aad728f7cadc4ecc
diff --git a/build/Build.cs b/build/Build.cs
index cbe4a36..acbdadc 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -55,7 +55,6 @@ class Build : NukeBuild
             Log.Debug( "Restoring solution {0}", Solution);
             Log.Debug("Restoring project {0}", AvaloniaProject);
             GitTasks.Git("rm KitopiaWeb");
-            GitTasks.Git("clone https://github.com/MakesYT/ScreenCapture.NET.git");
            GitTasks.Git("submodule foreach git pull");
            
            GitTasks.Git("submodule update --init --recursive --remote");