diff --git a/.gitmodules b/.gitmodules
index e1d4bb3f..24150a5f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "CrEaTiiOn-Brotherhood-Official-C-Theme"]
-	path = CrEaTiiOn-Brotherhood-Official-C-Theme
+[submodule "Vendor/CrEaTiiOn-Brotherhood-Official-C-Theme"]
+	path = Vendor/CrEaTiiOn-Brotherhood-Official-C-Theme
 	url = https://github.com/NessieHax/CrEaTiiOn-Brotherhood-Official-C-Theme.git
diff --git a/CrEaTiiOn-Brotherhood-Official-C-Theme b/CrEaTiiOn-Brotherhood-Official-C-Theme
deleted file mode 160000
index 7e7b27c7..00000000
--- a/CrEaTiiOn-Brotherhood-Official-C-Theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7e7b27c79cb20a3cffcf3df4f6b61a95eb165cdc
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 9559f6b0..6835c5f5 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -160,7 +160,9 @@
     <Compile Include="Classes\IO\Sounds\SoundIO.cs" />
     <Compile Include="Classes\IO\Sounds\Sounds.cs" />
     <Compile Include="Classes\Models\DefaultModels\Steve64x64Model.cs" />
-    <Compile Include="Classes\ToolboxItems\ThemeForm.cs" />
+    <Compile Include="Classes\ToolboxItems\ThemeForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Classes\Utils\3DS\3DSUtil.cs" />
     <Compile Include="Classes\Utils\ARC\ARCUtil.cs" />
     <Compile Include="Classes\Utils\SkinANIM.cs" />
@@ -785,7 +787,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CrEaTiiOn-Brotherhood-Official-C-Theme\Net_Framework_v4.8\Net Framework v4.8.csproj">
+    <ProjectReference Include="..\Vendor\CrEaTiiOn-Brotherhood-Official-C-Theme\Net_Framework_v4.8\Net Framework v4.8.csproj">
       <Project>{c3d7b16c-c047-4baa-884f-7a2308619c33}</Project>
       <Name>Net Framework v4.8</Name>
     </ProjectReference>
diff --git a/PCK_Studio.sln b/PCK_Studio.sln
index a86b118e..1b8efa07 100644
--- a/PCK_Studio.sln
+++ b/PCK_Studio.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PckStudio", "PCK-Studio\Pck
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CrEaTiiOn-Brotherhood-Official-C-Theme", "CrEaTiiOn-Brotherhood-Official-C-Theme", "{7DB3F605-FB30-45C8-9D21-AE2FF3A0344D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net Framework v4.8", "CrEaTiiOn-Brotherhood-Official-C-Theme\Net_Framework_v4.8\Net Framework v4.8.csproj", "{C3D7B16C-C047-4BAA-884F-7A2308619C33}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Net Framework v4.8", "Vendor\CrEaTiiOn-Brotherhood-Official-C-Theme\Net_Framework_v4.8\Net Framework v4.8.csproj", "{C3D7B16C-C047-4BAA-884F-7A2308619C33}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Vendor/CrEaTiiOn-Brotherhood-Official-C-Theme b/Vendor/CrEaTiiOn-Brotherhood-Official-C-Theme
new file mode 160000
index 00000000..b8ce1fe0
--- /dev/null
+++ b/Vendor/CrEaTiiOn-Brotherhood-Official-C-Theme
@@ -0,0 +1 @@
+Subproject commit b8ce1fe075550108c55823dbd485640835871cd3