diff --git a/Dependencies/ShaderConductor b/Dependencies/ShaderConductor
index 9420a9b..30a77c7 160000
--- a/Dependencies/ShaderConductor
+++ b/Dependencies/ShaderConductor
@@ -1 +1 @@
-Subproject commit 9420a9b06a059e7def5e5da15e357281f4382015
+Subproject commit 30a77c78d24fa08f4fe5fc4428f10dbfc92717a6
diff --git a/Dependencies/imgui b/Dependencies/imgui
index 242fe75..419e401 160000
--- a/Dependencies/imgui
+++ b/Dependencies/imgui
@@ -1 +1 @@
-Subproject commit 242fe753d92ea26510bc7948d87df6fc6c0a5c30
+Subproject commit 419e401d1fe8e9b6e45a31b5c0a27673b5d88fdc
diff --git a/Engine/src/Engine/Core/Application.h b/Engine/src/Engine/Core/Application.h
index 794377f..9b86e28 100644
--- a/Engine/src/Engine/Core/Application.h
+++ b/Engine/src/Engine/Core/Application.h
@@ -17,7 +17,7 @@ namespace Light {
 
 	class Instrumentor;
 
-	class Application
+	class Application /* singleton */
 	{
 	private:
 		static Application* s_Context;
diff --git a/Engine/src/Engine/Debug/Instrumentor.h b/Engine/src/Engine/Debug/Instrumentor.h
index f76d5f3..f11dcd6 100644
--- a/Engine/src/Engine/Debug/Instrumentor.h
+++ b/Engine/src/Engine/Debug/Instrumentor.h
@@ -17,11 +17,12 @@ namespace Light {
 
 	// #todo: add event categories
 	// #todo: use ofstream in a separate thread
-	class Instrumentor
+	class Instrumentor /* singleton */
 	{
 	private:
 		static Instrumentor* s_Context;
 
+	private:
 		std::ofstream m_OutputFileStream;
 
 		unsigned int m_CurrentSessionCount;
diff --git a/Engine/src/Engine/Debug/Logger.h b/Engine/src/Engine/Debug/Logger.h
index 197e989..9cc758e 100644
--- a/Engine/src/Engine/Debug/Logger.h
+++ b/Engine/src/Engine/Debug/Logger.h
@@ -46,11 +46,12 @@
 namespace Light {
 
 	// #todo: extend
-	class Logger
+	class Logger /* singleton */
 	{
 	private:
 		static Logger* s_Context;
 
+	private:
 		Ref<spdlog::logger> m_EngineLogger, m_ClientLogger, m_FileLogger;
 		std::string m_LogFilePath;
 
diff --git a/Engine/src/Engine/Graphics/GraphicsContext.h b/Engine/src/Engine/Graphics/GraphicsContext.h
index a615454..31d5d98 100644
--- a/Engine/src/Engine/Graphics/GraphicsContext.h
+++ b/Engine/src/Engine/Graphics/GraphicsContext.h
@@ -23,11 +23,13 @@ namespace Light {
 		Metal   // :#todo
 	};
 
-	class GraphicsContext
+	class GraphicsContext /* singleton */
 	{
 	private:
 		static GraphicsContext* s_Context;
 
+	private:
+
 		Scope<UserInterface> m_UserInterface;
 		Scope<Renderer> m_Renderer;
 
diff --git a/Engine/src/Engine/Input/Input.h b/Engine/src/Engine/Input/Input.h
index f8fd48c..760a894 100644
--- a/Engine/src/Engine/Input/Input.h
+++ b/Engine/src/Engine/Input/Input.h
@@ -10,11 +10,13 @@ namespace Light {
 
 	class Event;
 
-	class Input
+	class Input /* singleton */
 	{
 	private:
 		static Input* s_Context;
 
+	private:
+
 		std::array<bool, 348> m_KeyboadKeys;
 		std::array<bool, 8> m_MouseButtons;
 
diff --git a/Engine/src/Engine/Layer/LayerStack.h b/Engine/src/Engine/Layer/LayerStack.h
index 8af8c0c..5bb1699 100644
--- a/Engine/src/Engine/Layer/LayerStack.h
+++ b/Engine/src/Engine/Layer/LayerStack.h
@@ -8,11 +8,13 @@ namespace Light {
 
 	class Event;
 
-	class LayerStack
+	class LayerStack /* singleton */
 	{
 	private:
 		static LayerStack* s_Context;
 
+	private:
+
 		std::vector<Layer*> m_Layers;
 
 		std::vector<Layer*>::iterator m_Begin;
diff --git a/Engine/src/Engine/UserInterface/UserInterface.h b/Engine/src/Engine/UserInterface/UserInterface.h
index 0189481..5958aa3 100644
--- a/Engine/src/Engine/UserInterface/UserInterface.h
+++ b/Engine/src/Engine/UserInterface/UserInterface.h
@@ -13,11 +13,13 @@ namespace Light {
 	class SharedContext;
 
 	// #todo: fix the UserIntreface mess!!
-	class UserInterface
+	class UserInterface /* singleton */
 	{
 	private:
 		static UserInterface* s_Context;
 
+	private:
+
 		ImGuiWindowFlags m_DockspaceFlags;
 
 	public:
diff --git a/Engine/src/Engine/Utility/ResourceManager.h b/Engine/src/Engine/Utility/ResourceManager.h
index 3506b85..8f734fa 100644
--- a/Engine/src/Engine/Utility/ResourceManager.h
+++ b/Engine/src/Engine/Utility/ResourceManager.h
@@ -9,11 +9,13 @@ namespace Light {
 
 	class SharedContext;
 
-	class ResourceManager
+	class ResourceManager /* singleton */
 	{
 	private:
 		static ResourceManager* s_Context;
 
+	private:
+
 		std::unordered_map<std::string, Ref<Shader>> m_Shaders;
 		std::unordered_map<std::string, Ref<Texture>> m_Textures;