diff --git a/Linphone/tool/CMakeLists.txt b/Linphone/tool/CMakeLists.txt
index 2f0da985..e1486902 100644
--- a/Linphone/tool/CMakeLists.txt
+++ b/Linphone/tool/CMakeLists.txt
@@ -1,45 +1,60 @@
-list(APPEND _LINPHONEAPP_SOURCES tool / Constants.cpp tool / EnumsToString.cpp tool / Utils.cpp tool /
-     UriTools.cpp tool /
-     QExifImageHeader.cpp
+list(APPEND _LINPHONEAPP_SOURCES
+	tool/Constants.cpp
+	tool/EnumsToString.cpp
+	tool/Utils.cpp
+	tool/UriTools.cpp
+	tool/QExifImageHeader.cpp
 
-         tool /
-     LinphoneEnums.cpp tool / thread / SafeSharedPointer.hpp tool / thread / SafeConnection.hpp tool / thread /
-     Thread.cpp tool / providers / AvatarProvider.cpp tool / providers / EmojiProvider.cpp tool / providers /
-     ExternalImageProvider.cpp tool / providers / ImageProvider.cpp tool / providers / ScreenProvider.cpp tool /
-     providers /
-     ThumbnailProvider.cpp
-#tool / providers / VideoFrameGrabber.cpp
+	tool/LinphoneEnums.cpp
+	tool/thread/SafeSharedPointer.hpp
+	tool/thread/SafeConnection.hpp
+	tool/thread/Thread.cpp
+	tool/providers/AvatarProvider.cpp
+	tool/providers/EmojiProvider.cpp
+	tool/providers/ExternalImageProvider.cpp
+	tool/providers/ImageProvider.cpp
+	tool/providers/ScreenProvider.cpp
+	tool/providers/ThumbnailProvider.cpp
+	# tool/providers/VideoFrameGrabber.cpp
+	
+	tool/native/DesktopTools.hpp
 
-         tool /
-     native /
-     DesktopTools.hpp
+	tool/request/RequestDialog.cpp
+	tool/request/CallbackHelper.cpp
 
-         tool /
-     request / RequestDialog.cpp tool / request /
-     CallbackHelper.cpp
+	tool/file/FileDownloader.cpp
+	tool/file/FileExtractor.cpp
+	tool/file/TemporaryFile.cpp
 
-         tool /
-     file / FileDownloader.cpp tool / file / FileExtractor.cpp tool / file /
-     TemporaryFile.cpp
+	tool/ui/DashRectangle.cpp
 
-         tool /
-     ui /
-     DashRectangle.cpp
+	tool/accessibility/AccessibilityHelper.cpp
+	tool/accessibility/KeyboardShortcuts.cpp
+	tool/accessibility/FocusHelper.cpp
 
-         tool /
-     accessibility / AccessibilityHelper.cpp tool / accessibility / KeyboardShortcuts.cpp tool / accessibility /
-     FocusHelper.cpp
+)
 
-     )
+if (APPLE)
+	list(APPEND _LINPHONEAPP_SOURCES
+		tool/native/DesktopToolsMacOs.cpp
+		tool/native/DesktopToolsMacOsNative.mm
+		tool/native/screen-saver/ScreenSaverMacOs.m
+		tool/native/state-process/StateProcessMacOs.mm
+		)
+elseif (WIN32)
+	list(APPEND _LINPHONEAPP_SOURCES
+		tool/native/DesktopToolsWindows.cpp
+		)
+else ()
+	list(APPEND _LINPHONEAPP_SOURCES
+		tool/native/DesktopToolsLinux.cpp
+		tool/native/screen-saver/ScreenSaverDBus.cpp
+		tool/native/screen-saver/ScreenSaverXdg.cpp
+		)
+endif ()
 
-    if (APPLE) list(APPEND _LINPHONEAPP_SOURCES tool / native / DesktopToolsMacOs.cpp tool / native /
-                        DesktopToolsMacOsNative.mm tool / native / screen -
-                    saver / ScreenSaverMacOs.m tool / native / state - process / StateProcessMacOs.mm) elseif(WIN32)
-        list(APPEND _LINPHONEAPP_SOURCES tool / native / DesktopToolsWindows.cpp) else()
-            list(APPEND _LINPHONEAPP_SOURCES tool / native / DesktopToolsLinux.cpp tool / native / screen -
-                 saver / ScreenSaverDBus.cpp tool / native / screen - saver / ScreenSaverXdg.cpp) endif()
+if (HAVE_CRASH_HANDLER)
+	list(APPEND _LINPHONEAPP_SOURCES tool/crash_reporter/CrashReporter.cpp)
+endif()
 
-                if (HAVE_CRASH_HANDLER) list(APPEND _LINPHONEAPP_SOURCES tool / crash_reporter / CrashReporter.cpp)
-                    endif()
-
-                        set(_LINPHONEAPP_SOURCES ${_LINPHONEAPP_SOURCES} PARENT_SCOPE)
+set(_LINPHONEAPP_SOURCES ${_LINPHONEAPP_SOURCES} PARENT_SCOPE)