diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72adbcbe..ef2d6de8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 #
 # uvw
 #
+
 cmake_minimum_required(VERSION 3.2)
 
 #
@@ -15,15 +16,12 @@ endif()
 # Project configuration
 #
 
-project(uvw
-        VERSION 1.1.1)
+project(uvw VERSION 1.1.1)
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug)
 endif()
 
-set(SETTINGS_ORGANIZATION "Michele Caini")
-set(SETTINGS_APPLICATION ${PROJECT_NAME})
 set(PROJECT_AUTHOR "Michele Caini")
 set(PROJECT_AUTHOR_EMAIL "michele.caini@gmail.com")
 
@@ -109,14 +107,14 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 set(CPACK_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "uvw")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_NAME})
 set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
 set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-src)
 set(CPACK_RESOURCE_FILE_LICENSE ${uvw_SOURCE_DIR}/LICENSE)
 set(CPACK_RESOURCE_FILE_README ${uvw_SOURCE_DIR}/README.md)
 set(CPACK_GENERATOR TGZ)
 set(CPACK_SOURCE_GENERATOR TGZ)
-set(CPACK_PACKAGING_INSTALL_DIRECTORY "uvw-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
+set(CPACK_PACKAGING_INSTALL_DIRECTORY "uvw-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 
 include(CPack)
 
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 275a5f7c..7f7b8b46 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -6,8 +6,8 @@ set(TARGET_DOCS docs)
 
 set(DOXY_IN_FILE doxy.in)
 
-set(DOXY_DOCS_DIRECTORY ${PROJECT_DOCS_DIR})
 set(DOXY_SOURCE_DIRECTORY ${PROJECT_SRC_DIR})
+set(DOXY_DOCS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 set(DOXY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set(DOXY_CFG_FILE doxy.cfg)
 
@@ -16,12 +16,12 @@ configure_file(${DOXY_IN_FILE} ${DOXY_CFG_FILE} @ONLY)
 add_custom_target(
     ${TARGET_DOCS}
     COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/${DOXY_CFG_FILE}
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    WORKING_DIRECTORY ${uvw_SOURCE_DIR}
     VERBATIM
     SOURCES ${DOXY_IN_FILE}
 )
 
 install(
     DIRECTORY ${DOXY_OUTPUT_DIRECTORY}/html
-    DESTINATION ${PROJECT_SHARE_OUTPUT_DIRECTORY}/${PROJECT_NAME}-${PROJECT_VERSION}/
+    DESTINATION share/${PROJECT_NAME}-${PROJECT_VERSION}/
 )