diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index a2875d013acd5ba94c4db30537bff7e7d07fce74..a0f6546527fe4b6659d8e9c53f9f709d726b0cce 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -14,21 +14,20 @@
                 "${workspaceFolder}/src/iiwa_com/include",
                 "${workspaceFolder}/src/realsense/realsense2_camera/include",
                 "${workspaceFolder}/src/robo_guide/include",
-                "${workspaceFolder}/src/scigl_render_ros/include",
                 "${workspaceFolder}/src/filter_bay/include",
-                "${workspaceFolder}/src/scigl_render_ros/build/devel/include",
+                "${workspaceFolder}/src/scigl_render_ros/include",
+                "${workspaceFolder}/src/robo_guide_imarker/robo_guide_imarker/include",
+                "${workspaceFolder}/src/robo_guide_imarker/include",
+                "${workspaceFolder}/devel/.private/robo_guide_msgs/include",
                 "/opt/ros/melodic/include",
                 "/usr/include",
                 "~/.conan/data/",
-                "~/.conan/data/scigl_render/0.2.1/tuebel/testing/package/19cca5524583fb8ef658705ac606cb918f7476b9/include",
+                "~/.conan/data/scigl_render/0.4/tuebel/testing/package/19cca5524583fb8ef658705ac606cb918f7476b9/include",
                 "~/.conan/data/gl3w/0.2/tuebel/testing/package/1a651c5b4129ad794b88522bece2281a7453aee4/include",
                 "~/.conan/data/glm/0.9.9.1/g-truc/stable/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/include",
                 "~/.conan/data/glfw/3.2.1/bincrafters/stable/package/0a813c597d519ec14c71192b99d7de0a92bbc1c3/include",
                 "~/.conan/data/Assimp/4.1.0/jacmoe/stable/package/05bf1afde60b180032c7cd80413ff5f9be212fd1/include",
-                "~/.conan/data/filter_bay/0.1/tuebel/testing/source/include",
-                "${workspaceFolder}/src/robo_guide_imarker/robo_guide_imarker/include",
-                "${workspaceFolder}/src/robo_guide_imarker/include",
-                "${workspaceFolder}/devel/.private/robo_guide_msgs/include"
+                "~/.conan/data/filter_bay/0.1/tuebel/testing/source/include"              
             ],
             "name": "Linux",
             "intelliSenseMode": "gcc-x64",
diff --git a/robo_guide.code-workspace b/robo_guide.code-workspace
index 0885a6612a41205f0d691e1ea5b9ea2917dae675..46af67cf4bcd2d7f4e961983633c80b5ef3190dc 100644
--- a/robo_guide.code-workspace
+++ b/robo_guide.code-workspace
@@ -68,7 +68,8 @@
 			"typeindex": "cpp",
 			"hash_map": "cpp",
 			"hash_set": "cpp",
-			"unordered_set": "cpp"
+			"unordered_set": "cpp",
+			"*.vs": "cpp"
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/easy_handeye b/src/easy_handeye
index 66e46c9ba2bba06b751876fe86e7f970c81f5afc..f6961bfc5742e7d7e1fd285b3ecb74b7880fa363 160000
--- a/src/easy_handeye
+++ b/src/easy_handeye
@@ -1 +1 @@
-Subproject commit 66e46c9ba2bba06b751876fe86e7f970c81f5afc
+Subproject commit f6961bfc5742e7d7e1fd285b3ecb74b7880fa363
diff --git a/src/robo_guide b/src/robo_guide
index 2c768a947e0c452ba9e5b628453488702bb2a26a..c46391ae42374c82add1e3d1a584bd00d7687331 160000
--- a/src/robo_guide
+++ b/src/robo_guide
@@ -1 +1 @@
-Subproject commit 2c768a947e0c452ba9e5b628453488702bb2a26a
+Subproject commit c46391ae42374c82add1e3d1a584bd00d7687331
diff --git a/src/scigl_render_ros b/src/scigl_render_ros
index cc46930c29956ef3c4b50544ee067792d9d18578..4b5cd874e4dc7dcfda9896a3b5abd98ad011c3c5 160000
--- a/src/scigl_render_ros
+++ b/src/scigl_render_ros
@@ -1 +1 @@
-Subproject commit cc46930c29956ef3c4b50544ee067792d9d18578
+Subproject commit 4b5cd874e4dc7dcfda9896a3b5abd98ad011c3c5