diff --git a/tutorial/701_Statistics/CMakeLists.txt b/tutorial/701_Statistics/CMakeLists.txt
index 40962ab62..10560bb27 100644
--- a/tutorial/701_Statistics/CMakeLists.txt
+++ b/tutorial/701_Statistics/CMakeLists.txt
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(701_Statistics)
 
 add_executable(${PROJECT_NAME}_bin main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer tutorials)
diff --git a/tutorial/702_WindingNumber/CMakeLists.txt b/tutorial/702_WindingNumber/CMakeLists.txt
index fca227135..f72be3d30 100644
--- a/tutorial/702_WindingNumber/CMakeLists.txt
+++ b/tutorial/702_WindingNumber/CMakeLists.txt
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(702_WindingNumber)
 
 add_executable(${PROJECT_NAME}_bin main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer tutorials)
diff --git a/tutorial/703_Decimation/CMakeLists.txt b/tutorial/703_Decimation/CMakeLists.txt
index 3eb35519a..2814a5c83 100644
--- a/tutorial/703_Decimation/CMakeLists.txt
+++ b/tutorial/703_Decimation/CMakeLists.txt
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(703_Decimation)
 
 add_executable(${PROJECT_NAME}_bin main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer tutorials)
diff --git a/tutorial/704_SignedDistance/CMakeLists.txt b/tutorial/704_SignedDistance/CMakeLists.txt
index 7644caddc..53571949a 100644
--- a/tutorial/704_SignedDistance/CMakeLists.txt
+++ b/tutorial/704_SignedDistance/CMakeLists.txt
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(704_SignedDistance)
 
 add_executable(${PROJECT_NAME}_bin main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer tutorials)
diff --git a/tutorial/705_MarchingCubes/CMakeLists.txt b/tutorial/705_MarchingCubes/CMakeLists.txt
index 3b640e8a4..910fc4983 100644
--- a/tutorial/705_MarchingCubes/CMakeLists.txt
+++ b/tutorial/705_MarchingCubes/CMakeLists.txt
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(705_MarchingCubes)
 
 add_executable(${PROJECT_NAME}_bin main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer tutorials)
diff --git a/tutorial/707_SweptVolume/CMakeLists.txt b/tutorial/707_SweptVolume/CMakeLists.txt
index 3a7947f5e..f63747839 100644
--- a/tutorial/707_SweptVolume/CMakeLists.txt
+++ b/tutorial/707_SweptVolume/CMakeLists.txt
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(707_SweptVolume)
 
 add_executable(${PROJECT_NAME}_bin main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer tutorials)
diff --git a/tutorial/708_Picking/CMakeLists.txt b/tutorial/708_Picking/CMakeLists.txt
index e3cacf4de..b0ffabfdf 100644
--- a/tutorial/708_Picking/CMakeLists.txt
+++ b/tutorial/708_Picking/CMakeLists.txt
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(708_Picking)
 
 add_executable(${PROJECT_NAME}_bin main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer tutorials)
diff --git a/tutorial/709_VectorFieldVisualizer/CMakeLists.txt b/tutorial/709_VectorFieldVisualizer/CMakeLists.txt
index 947b24380..293ae3fee 100644
--- a/tutorial/709_VectorFieldVisualizer/CMakeLists.txt
+++ b/tutorial/709_VectorFieldVisualizer/CMakeLists.txt
@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(709_VectorFieldVisualizer)
 
-add_executable(${PROJECT_NAME}_bin
-        main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_COMISO_EXTRA_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+add_executable(${PROJECT_NAME}_bin main.cpp)
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::comiso igl::viewer tutorials)
diff --git a/tutorial/710_SLIM/CMakeLists.txt b/tutorial/710_SLIM/CMakeLists.txt
index 89e2f008d..99588301d 100644
--- a/tutorial/710_SLIM/CMakeLists.txt
+++ b/tutorial/710_SLIM/CMakeLists.txt
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(710_SLIM)
 
 add_executable(${PROJECT_NAME}_bin main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer tutorials)
diff --git a/tutorial/711_Subdivision/CMakeLists.txt b/tutorial/711_Subdivision/CMakeLists.txt
index 9e0bad491..b25e8b063 100644
--- a/tutorial/711_Subdivision/CMakeLists.txt
+++ b/tutorial/711_Subdivision/CMakeLists.txt
@@ -2,6 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
 project(711_Subdivision)
 
 add_executable(${PROJECT_NAME}_bin main.cpp)
-target_include_directories(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_INCLUDE_DIRS})
-target_compile_definitions(${PROJECT_NAME}_bin PRIVATE ${LIBIGL_DEFINITIONS})
-target_link_libraries(${PROJECT_NAME}_bin ${LIBIGL_LIBRARIES} ${LIBIGL_VIEWER_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_EXTRA_LIBRARIES} ${LIBIGL_OPENGL_GLFW_EXTRA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}_bin igl::core igl::viewer tutorials)
diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt
index e65fe4836..485b01464 100644
--- a/tutorial/CMakeLists.txt
+++ b/tutorial/CMakeLists.txt
@@ -39,7 +39,7 @@ option(TUTORIALS_CHAPTER3 "Compile chapter 3" ON)
 option(TUTORIALS_CHAPTER4 "Compile chapter 4" ON)
 option(TUTORIALS_CHAPTER5 "Compile chapter 5" ON)
 option(TUTORIALS_CHAPTER6 "Compile chapter 6" ON)
-option(TUTORIALS_CHAPTER7 "Compile chapter 7" OFF)
+option(TUTORIALS_CHAPTER7 "Compile chapter 7" ON)
 
 # Store location of tutorial/shared directory
 set(TUTORIAL_SHARED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/shared CACHE PATH "location of shared tutorial resources")
@@ -140,9 +140,9 @@ if(TUTORIALS_CHAPTER7)
   add_subdirectory("703_Decimation")
   add_subdirectory("704_SignedDistance")
   add_subdirectory("705_MarchingCubes")
-  if(LIBIGL_WITH_EMBREE)
-    add_subdirectory("706_FacetOrientation")
-  endif()
+  # if(LIBIGL_WITH_EMBREE)
+  #   add_subdirectory("706_FacetOrientation")
+  # endif()
   add_subdirectory("707_SweptVolume")
   add_subdirectory("708_Picking")
   if(LIBIGL_WITH_COMISO)