diff --git a/cmake/cmlib b/cmake/cmlib
index 28e7c7f..9002b99 160000
--- a/cmake/cmlib
+++ b/cmake/cmlib
@@ -1 +1 @@
-Subproject commit 28e7c7ffa2602219fc6a90728df703996e0e45de
+Subproject commit 9002b99e3ec498c0cd431a985807b1df81590cd0
diff --git a/cmake/find b/cmake/find
index af57d39..d0bc6e7 160000
--- a/cmake/find
+++ b/cmake/find
@@ -1 +1 @@
-Subproject commit af57d3921c4d944f8475090f42b034518f7c0bc7
+Subproject commit d0bc6e71e9c613eaaecca62eaf445d647f5216ed
diff --git a/src/myx/base/CMakeLists.txt b/src/myx/base/CMakeLists.txt
index 5aca9ab..3e3b4e3 100644
--- a/src/myx/base/CMakeLists.txt
+++ b/src/myx/base/CMakeLists.txt
@@ -17,7 +17,9 @@ add_clang_tidy_check(${current_target} ${current_target_sources})
 add_clang_analyze_check(${current_target} ${current_target_sources})
 add_clazy_check(${current_target} ${current_target_sources})
 add_pvs_check(${current_target})
-add_uncrustify_format(${current_target} ${current_target_sources} ${current_target_headers})
+
+# Форматирование исходников
+add_format_sources(${current_target} ${current_target_sources} ${current_target_headers})
 
 target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
 
diff --git a/src/myx/filesystem/CMakeLists.txt b/src/myx/filesystem/CMakeLists.txt
index f454917..3439d0e 100644
--- a/src/myx/filesystem/CMakeLists.txt
+++ b/src/myx/filesystem/CMakeLists.txt
@@ -22,7 +22,9 @@ add_clang_tidy_check(${current_target} ${current_target_sources})
 add_clang_analyze_check(${current_target} ${current_target_sources})
 add_clazy_check(${current_target} ${current_target_sources})
 add_pvs_check(${current_target})
-add_uncrustify_format(${current_target} ${current_target_sources} ${current_target_headers})
+
+# Форматирование исходников
+add_format_sources(${current_target} ${current_target_sources} ${current_target_headers})
 
 target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
 target_include_directories(${current_target} SYSTEM PUBLIC ${FMT_INCLUDE_DIRS})
diff --git a/src/myx/log/CMakeLists.txt b/src/myx/log/CMakeLists.txt
index 1ee6509..8746cbd 100644
--- a/src/myx/log/CMakeLists.txt
+++ b/src/myx/log/CMakeLists.txt
@@ -20,7 +20,9 @@ add_clang_tidy_check(${current_target} ${current_target_sources})
 add_clang_analyze_check(${current_target} ${current_target_sources})
 add_clazy_check(${current_target} ${current_target_sources})
 add_pvs_check(${current_target})
-add_uncrustify_format(${current_target} ${current_target_sources} ${current_target_headers})
+
+# Форматирование исходников
+add_format_sources(${current_target} ${current_target_sources} ${current_target_headers})
 
 target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
 target_include_directories(${current_target} SYSTEM PUBLIC ${FMT_INCLUDE_DIRS})
diff --git a/src/myx/qt/CMakeLists.txt b/src/myx/qt/CMakeLists.txt
index 0939200..ebcb425 100644
--- a/src/myx/qt/CMakeLists.txt
+++ b/src/myx/qt/CMakeLists.txt
@@ -16,7 +16,9 @@ add_clang_tidy_check(${current_target} ${current_target_sources})
 add_clang_analyze_check(${current_target} ${current_target_sources})
 add_clazy_check(${current_target} ${current_target_sources})
 add_pvs_check(${current_target})
-add_uncrustify_format(${current_target} ${current_target_sources} ${current_target_headers})
+
+# Форматирование исходников
+add_format_sources(${current_target} ${current_target_sources} ${current_target_headers})
 
 target_include_directories(${current_target} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
 target_include_directories(${current_target} SYSTEM PUBLIC ${FMT_INCLUDE_DIRS})