diff --git a/src/templates/common.cmake b/src/templates/common.cmake
index 4ed5e83b5..7dfe4553a 100644
--- a/src/templates/common.cmake
+++ b/src/templates/common.cmake
@@ -1,4 +1,11 @@
 {% extends "CMakeLists.template.cmake" %}
+
+{% block before_vars %}
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../ML_VERSION")
+    file(READ "${CMAKE_CURRENT_SOURCE_DIR}/../../ML_VERSION" MESHLAB_VERSION)
+    add_definitions(-DMESHLAB_VERSION=${MESHLAB_VERSION})
+endif()
+{% endblock %}
 {% block outputdir %}{%endblock%}
 {% block add_target %}
 set(TARGET_TYPE SHARED)
diff --git a/src/templates/sample_filtergpu.cmake b/src/templates/edit_sample.cmake
similarity index 100%
rename from src/templates/sample_filtergpu.cmake
rename to src/templates/edit_sample.cmake
diff --git a/src/templates/filter_mutualinfoxml.cmake b/src/templates/filter_mutualinfo.cmake
similarity index 52%
rename from src/templates/filter_mutualinfoxml.cmake
rename to src/templates/filter_mutualinfo.cmake
index a232a21aa..668a1214c 100644
--- a/src/templates/filter_mutualinfoxml.cmake
+++ b/src/templates/filter_mutualinfo.cmake
@@ -1,2 +1 @@
-{% set name = "filter_mutualinfo" %}
 {% extends "plugin_with_levmar.cmake" %}
diff --git a/src/templates/sampleedit.cmake b/src/templates/filter_sample_gpu.cmake
similarity index 100%
rename from src/templates/sampleedit.cmake
rename to src/templates/filter_sample_gpu.cmake
diff --git a/src/templates/filter_screened_poisson_xml.cmake b/src/templates/filter_screened_poisson_xml.cmake
new file mode 100644
index 000000000..7941a478e
--- /dev/null
+++ b/src/templates/filter_screened_poisson_xml.cmake
@@ -0,0 +1,20 @@
+{% set name = "filter_screened_poisson" %}
+{% extends "CMakeLists.template.cmake" %}
+{# subset of the sources #}
+{% block sources %}
+filter_screened_poisson.cpp
+Src/MarchingCubes.cpp
+# Src/CmdLineParser.cpp
+Src/Factor.cpp
+Src/Geometry.cpp 
+{% endblock %}
+
+{% block linking %}
+target_compile_definitions({{name}} PRIVATE BRUNO_LEVY_FIX FOR_RELEASE)
+
+if(OpenMP_CXX_FOUND)
+    target_link_libraries({{name}} PRIVATE OpenMP::OpenMP_CXX)
+endif()
+
+{{ super() }}
+{% endblock %}
diff --git a/src/templates/meshlab.cmake b/src/templates/meshlab.cmake
index 36c0cec33..6426363e1 100644
--- a/src/templates/meshlab.cmake
+++ b/src/templates/meshlab.cmake
@@ -16,10 +16,10 @@
 
 {% block add_target %}
 set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
-if(APPLE)
-    list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
-                images/meshlab.icns)
-endif()
+#if(APPLE)
+#    list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../install/macx/info.plist
+#                images/meshlab.icns)
+#endif()
 
 if(WIN32)
     list(APPEND SOURCES meshlab.rc)