diff --git a/CMakeLists.txt b/CMakeLists.txt
index d609644ec1a41c1947a05ed38d6f0fefb3f35088..5ae7be96ac49e4e245d16d978a2bdace25c0d911 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ else()
     find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 endif()
 if (Simox_FOUND)
-	setupSimoxExternalLibraries()
+        setupSimoxExternalLibraries()
     if(ARMARX_USE_QT5)
         if(Simox_USE_QT4)
             message(FATAL_ERROR "ArmarX uses Qt5 and Simox uses Qt4")
diff --git a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt
index c525b7e842bd117c6a78a14a8fd7947d694fff2a..ed007812898ec75e5d8d1225296bbd62b9efe041 100644
--- a/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt
+++ b/scenarios/tests/RemoteRobotTest/RemoteRobotTestProject/CMakeLists.txt
@@ -44,7 +44,14 @@ if (ARMARX_BUILD)
     include_directories(SYSTEM ${Eigen3_INCLUDE_DIR})
     include_directories(${Simox_INCLUDE_DIR})
     
-    set(COMPONENT_LIBS RemoteRobotTestProjectInterfaces ArmarXInterfaces ArmarXCoreRemoteRobot ArmarXCore  ${Simox_LIBRARIES} ${Coin3D_LIBRARIES})
+    set(COMPONENT_LIBS
+        RemoteRobotTestProjectInterfaces
+        ArmarXInterfaces
+        ArmarXCoreRemoteRobot
+        ArmarXCore
+        ${Simox_LIBRARIES}
+        ${Coin3D_LIBRARIES}
+    )
 
     set(SOURCES RemoteRobotTestProject.cpp
         RemoteRobotTestProject.h
diff --git a/source/RobotAPI/components/ViewSelection/CMakeLists.txt b/source/RobotAPI/components/ViewSelection/CMakeLists.txt
index a8cbae65015cee0fafe082414e982a441d2a72ba..ba3a6b8df5dbca6caf1e027529dd507ea070d49d 100644
--- a/source/RobotAPI/components/ViewSelection/CMakeLists.txt
+++ b/source/RobotAPI/components/ViewSelection/CMakeLists.txt
@@ -14,14 +14,8 @@ set(COMPONENT_LIBS
     ${Simox_LIBRARIES}
 )
 
-set(SOURCES
-./ViewSelection.cpp
-#@TEMPLATE_LINE@@COMPONENT_PATH@/@COMPONENT_NAME@.cpp
-)
-set(HEADERS
-./ViewSelection.h
-#@TEMPLATE_LINE@@COMPONENT_PATH@/@COMPONENT_NAME@.h
-)
+set(SOURCES ViewSelection.cpp)
+set(HEADERS ViewSelection.h)
 
 armarx_add_component("${SOURCES}" "${HEADERS}")
 
diff --git a/source/RobotAPI/components/units/CMakeLists.txt b/source/RobotAPI/components/units/CMakeLists.txt
index 5830dcf7e00b7944c2f06678255b72a107f91b0a..6652dae03bf37aed49342cea8160df75976f7ab5 100644
--- a/source/RobotAPI/components/units/CMakeLists.txt
+++ b/source/RobotAPI/components/units/CMakeLists.txt
@@ -17,7 +17,8 @@ set(LIBS
     RobotAPICore
     ArmarXCoreObservers
     ArmarXCoreEigen3Variants
-    ${Simox_LIBRARIES})
+    ${Simox_LIBRARIES}
+)
 
 set(LIB_HEADERS
     ForceTorqueObserver.h