diff --git a/Makefile b/Makefile
index eaaad3a..d523a1e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,10 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH))
 CMAKE_COMMAND = cmake
 CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
 CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
-#CMAKE_SOURCE_DIR = ./source
-#CMAKE_BUILD_DIR = ./compile
 FILE_VERSION = VERSION.md
 DEPENDS = /bin/cmake
 PREFIX ?= /usr
 PKGNAME = $(MAKEFILE_DIR)
-#PKGNAME = ubl-settings-bootloader
 
 default_target: all
 
@@ -35,8 +32,8 @@ depend:
 		exit 1; \
 	    fi; \
 	done; \
+	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B${CMAKE_BUILD_DIR} --check-build-system CMakeFiles/Makefile.cmake 1 || exit 1; \
 	echo "Check depends: OK"
-#	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 
 debug:
 	@echo "Debug ..."
@@ -85,8 +82,7 @@ uninstall:
 	done
 	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
 	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
-	@$(RM) "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/logo-background.png"
-	@$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.pkexec.${PKGNAME}.exec.policy"
+	@$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"
 	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
 	@$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}"
 	@if [ -z ${DESTDIR} ]; then \
@@ -108,7 +104,7 @@ install: check uninstall
 	done
 	@for SIZE in 16 32 48; do \
 		install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
-		rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
+		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
 	done
 	@install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
@@ -116,17 +112,17 @@ install: check uninstall
 	@install -dm755 "${DESTDIR}${PREFIX}/share/applications"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
 	@install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.pkexec.${PKGNAME}.exec.policy"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"
 	@install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images}
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "logo-background.png"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
-	@install -Dm644 -t /usr/share/${PKGNAME}/ grub-cmdline-linux.csv
-	@install -Dm644 -t /usr/share/${PKGNAME}/ grub-terminal-input.csv
-	@install -Dm644 -t /usr/share/${PKGNAME}/ grub-terminal-output.csv
-	@install -Dm644 -t /usr/share/${PKGNAME}/ grub-play.csv
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/" grub-cmdline-linux.csv
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/" grub-terminal-input.csv
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/" grub-terminal-output.csv
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/" grub-play.csv
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
@@ -152,12 +148,13 @@ up_ver:
 	echo "Updated version to VERSION.md: $${CURRENT} to $${VER}"
 
 help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... init"
-	@echo "... debug"
-	@echo "... prepare"
-	@echo "... compile"
-	@echo "... install"
-	@echo "... uninstall"
-	@echo "... clean"
+	@echo "The following are some of the valid targets for this Makefile:"; \
+	echo "... all (the default if no target is provided)"; \
+	echo "... init"; \
+	echo "... debug"; \
+	echo "... prepare"; \
+	echo "... compile"; \
+	echo "... install"; \
+	echo "... uninstall"; \
+	echo "... clean"; \
+	echo "... up_ver"
\ No newline at end of file
diff --git a/VERSION.md b/VERSION.md
index 12ebd01..ca75749 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-VERSION 1.0
+VERSION 2.2
diff --git a/com.ublinux.pkexec.ubl-settings-bootloader.exec.policy b/com.ublinux.ubl-settings-bootloader.policy
similarity index 67%
rename from com.ublinux.pkexec.ubl-settings-bootloader.exec.policy
rename to com.ublinux.ubl-settings-bootloader.policy
index 50b1000..e89b2ed 100644
--- a/com.ublinux.pkexec.ubl-settings-bootloader.exec.policy
+++ b/com.ublinux.ubl-settings-bootloader.policy
@@ -7,11 +7,11 @@
   <vendor>UBLinux</vendor>
   <vendor_url>https://ublinux.ru</vendor_url>
 
-  <action id="org.freedesktop.policykit.ubl-settings-bootloader.pkexec.policy.run">
+  <action id="com.ublinux.ubl-settings-bootloader.run">
     <description>Run "ubl-settings-bootloader" as root</description>
-    <description xml:lang="ru">Запуск утилиты "ubl-settings-bootloader" с правами root</description>
-    <message>Authentication is required to run "ubl-settings-bootloader"</message>
-    <message xml:lang="ru">Требуется авторизация для запуска утилиты "ubl-settings-bootloader" с правами root</message>
+    <description xml:lang="ru">Запуск утилиты ubl-settings-bootloader с правами root</description>
+    <message>Authentication is required to run ubl-settings-bootloader</message>
+    <message xml:lang="ru">Требуется авторизация для запуска утилиты ubl-settings-bootloader с правами root</message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 670aa0b..62bfb35 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,18 +1,21 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.23)
 project(ubl-settings-bootloader)
 
 find_package(PkgConfig REQUIRED)
 
-pkg_check_modules(GTK REQUIRED gtkmm-3.0)
-include_directories(${GTK_INCLUDE_DIRS})
-link_directories(${GTK_LIBRARY_DIRS})
-add_definitions(${GTK_CFLAGS_OTHER})
+pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+include_directories(${GTK3_INCLUDE_DIRS})
+link_directories(${GTK3_LIBRARY_DIRS})
+add_definitions(${GTK3_CFLAGS_OTHER})
+
+pkg_check_modules(GTKMM30 REQUIRED gtkmm-3.0)
+include_directories(${GTKMM30_INCLUDE_DIRS})
+link_directories(${GTKMM30_LIBRARY_DIRS})
+add_definitions(${GTKMM30_CFLAGS_OTHER})
 
 find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 
 option(WEBKIT_FOUND "No" OFF)
-
-find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 if(WEBKIT_LIBRARIES_FOUND)
         option(WEBKIT_FOUND "Yes" ON)
         PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
@@ -20,9 +23,8 @@ if(WEBKIT_LIBRARIES_FOUND)
         link_directories(${WEBKIT_LIBRARY_DIRS})
         add_definitions(${WEBKIT_CFLAGS_OTHER})
 endif()
-configure_file(ubl-settings-bootloader.h.in ubl-settings-bootloader-cm.h)
-
 
+configure_file(ubl-settings-bootloader.h.in ubl-settings-bootloader-cm.h)
 
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a -g")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
@@ -49,13 +51,12 @@ set(SOURCE_FILES
         main.cc) 
 
 set(LIBRARIES
-        ${GTK_LIBRARIES}
+        ${GTK3_LIBRARIES}
+        ${GTKMM30_LIBRARIES}
+        ${WEBKIT_LIBRARIES}
         pthread)
 
-add_executable(ubl-settings-bootloader ${SOURCE_FILES})
-target_link_libraries(ubl-settings-bootloader PUBLIC ${WEBKIT_LIBRARIES} ${LIBRARIES})
-target_include_directories(ubl-settings-bootloader PUBLIC
-                           "${PROJECT_BINARY_DIR}"
-                           ${WEBKIT_INCLUDE_DIRS}
-                           )
-install(TARGETS ubl-settings-bootloader DESTINATION bin)
\ No newline at end of file
+add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARIES})
+target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR})
+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc
old mode 100755
new mode 100644
index b1aa3b6..e865002
--- a/source/ubl-settings-bootloader.cc
+++ b/source/ubl-settings-bootloader.cc
@@ -9,7 +9,7 @@ bool flag_save_local = false;
 bool flag_save_global = false;
 bool flag_load_global = false;
 bool flag_lock_help = false;
-string version_application = "1.0";
+string version_application = "2.2";
 
 MainWindow* obj_main;
 void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) {
diff --git a/ubl-settings-bootloader.desktop b/ubl-settings-bootloader.desktop
index 4a08f9a..9bdf501 100644
--- a/ubl-settings-bootloader.desktop
+++ b/ubl-settings-bootloader.desktop
@@ -12,4 +12,4 @@ Icon=com.ublinux.ubl-settings-bootloader
 Terminal=false
 X-XfcePluggable=true
 X-UBLPluggable=true
-Categories=XFCE;GTK;Settings;DesktopSettings;X-UBL-SettingsManager;X-UBL-SystemSettings;
\ No newline at end of file
+Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;X-UBL-SettingsManager;X-UBL-SystemSettings;
\ No newline at end of file