diff --git a/data/shaders/multithreading/phong.vert.spv b/data/shaders/multithreading/phong.vert.spv
index 49239829..34453470 100644
Binary files a/data/shaders/multithreading/phong.vert.spv and b/data/shaders/multithreading/phong.vert.spv differ
diff --git a/data/shaders/multithreading/starsphere.frag.spv b/data/shaders/multithreading/starsphere.frag.spv
index 7fbc1cc3..3225917c 100644
Binary files a/data/shaders/multithreading/starsphere.frag.spv and b/data/shaders/multithreading/starsphere.frag.spv differ
diff --git a/data/shaders/multithreading/starsphere.vert.spv b/data/shaders/multithreading/starsphere.vert.spv
index 055b3352..995bb7e0 100644
Binary files a/data/shaders/multithreading/starsphere.vert.spv and b/data/shaders/multithreading/starsphere.vert.spv differ
diff --git a/multithreading/multithreading.cpp b/multithreading/multithreading.cpp
index 7f40dc27..5e1adc68 100644
--- a/multithreading/multithreading.cpp
+++ b/multithreading/multithreading.cpp
@@ -299,15 +299,10 @@ public:
 			&thread->pushConstBlock[cmdBufferIndex]);
 
 		VkDeviceSize offsets[1] = { 0 };
-		//vkCmdBindVertexBuffers(cmdBuffer, 0, 1, &thread->mesh.vertices.buf, offsets);
-		//vkCmdBindIndexBuffer(cmdBuffer, thread->mesh.indices.buf, 0, VK_INDEX_TYPE_UINT32);
-		//vkCmdDrawIndexed(cmdBuffer, thread->mesh.indexCount, 1, 0, 0, 0);
-
 		vkCmdBindVertexBuffers(cmdBuffer, 0, 1, &meshes.ufo.vertices.buf, offsets);
 		vkCmdBindIndexBuffer(cmdBuffer, meshes.ufo.indices.buf, 0, VK_INDEX_TYPE_UINT32);
 		vkCmdDrawIndexed(cmdBuffer, meshes.ufo.indexCount, 1, 0, 0, 0);
 
-
 		VK_CHECK_RESULT(vkEndCommandBuffer(cmdBuffer));
 	}
 
@@ -328,7 +323,6 @@ public:
 
 		vkCmdBindPipeline(secondaryCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelines.starsphere);
 
-
 		glm::mat4 view = glm::mat4();
 		view = glm::rotate(view, glm::radians(rotation.x), glm::vec3(1.0f, 0.0f, 0.0f));
 		view = glm::rotate(view, glm::radians(rotation.y), glm::vec3(0.0f, 1.0f, 0.0f));
@@ -644,63 +638,4 @@ public:
 	}
 };
 
-VulkanExample *vulkanExample;
-
-#if defined(_WIN32)
-LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	if (vulkanExample != NULL)
-	{
-		vulkanExample->handleMessages(hWnd, uMsg, wParam, lParam);
-	}
-	return (DefWindowProc(hWnd, uMsg, wParam, lParam));
-}
-#elif defined(__linux__) && !defined(__ANDROID__)
-static void handleEvent(const xcb_generic_event_t *event)
-{
-	if (vulkanExample != NULL)
-	{
-		vulkanExample->handleEvent(event);
-	}
-}
-#endif
-
-// Main entry point
-#if defined(_WIN32)
-// Windows entry point
-int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine, int nCmdShow)
-#elif defined(__ANDROID__)
-// Android entry point
-void android_main(android_app* state)
-#elif defined(__linux__)
-// Linux entry point
-int main(const int argc, const char *argv[])
-#endif
-{
-#if defined(__ANDROID__)
-	// Removing this may cause the compiler to omit the main entry point 
-	// which would make the application crash at start
-	app_dummy();
-#endif
-	vulkanExample = new VulkanExample();
-#if defined(_WIN32)
-	vulkanExample->setupWindow(hInstance, WndProc);
-#elif defined(__ANDROID__)
-	// Attach vulkan example to global android application state
-	state->userData = vulkanExample;
-	state->onAppCmd = VulkanExample::handleAppCommand;
-	state->onInputEvent = VulkanExample::handleAppInput;
-	vulkanExample->androidApp = state;
-#elif defined(__linux__)
-	vulkanExample->setupWindow();
-#endif
-#if !defined(__ANDROID__)
-	vulkanExample->initSwapchain();
-	vulkanExample->prepare();
-#endif
-	vulkanExample->renderLoop();
-	delete(vulkanExample);
-#if !defined(__ANDROID__)
-	return 0;
-#endif
-}
\ No newline at end of file
+VULKAN_EXAMPLE_MAIN()
\ No newline at end of file
diff --git a/multithreading/multithreading.vcxproj b/multithreading/multithreading.vcxproj
index 67963693..7003ae35 100644
--- a/multithreading/multithreading.vcxproj
+++ b/multithreading/multithreading.vcxproj
@@ -23,6 +23,12 @@
     <ClInclude Include="..\base\vulkanexamplebase.h" />
     <ClInclude Include="..\base\vulkantools.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\data\shaders\multithreading\phong.frag" />
+    <None Include="..\data\shaders\multithreading\phong.vert" />
+    <None Include="..\data\shaders\multithreading\starsphere.frag" />
+    <None Include="..\data\shaders\multithreading\starsphere.vert" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F5703C3C-F495-4D5C-BAA5-A90C4E20C7B7}</ProjectGuid>
     <RootNamespace>mesh</RootNamespace>
diff --git a/multithreading/multithreading.vcxproj.filters b/multithreading/multithreading.vcxproj.filters
index 73374a15..1311ea18 100644
--- a/multithreading/multithreading.vcxproj.filters
+++ b/multithreading/multithreading.vcxproj.filters
@@ -13,6 +13,9 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Shaders">
+      <UniqueIdentifier>{1a2e15c8-5d53-4bb1-bfe2-a3085baadc4f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\base\vulkandebug.cpp">
@@ -45,4 +48,18 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\data\shaders\multithreading\phong.frag">
+      <Filter>Shaders</Filter>
+    </None>
+    <None Include="..\data\shaders\multithreading\phong.vert">
+      <Filter>Shaders</Filter>
+    </None>
+    <None Include="..\data\shaders\multithreading\starsphere.frag">
+      <Filter>Shaders</Filter>
+    </None>
+    <None Include="..\data\shaders\multithreading\starsphere.vert">
+      <Filter>Shaders</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file