diff --git a/README.md b/README.md
index a104b78..c4ffdc0 100644
--- a/README.md
+++ b/README.md
@@ -1,39 +1,48 @@
-# [UBInstall](https://ublinux.ru/)
- 
+# ubinstall-gtk
-## Описание
+## Description
+The operating system installer (UBInstall-gtk) allows you to conveniently install the operating system.
-Установщик оерационной системы UBLinux (UBInstall) позволяет в удобно установить операционную систему.
+# Build
+In order to build ubinstall-gtk you will need:
-## Установка
+- CMake
+- C compiler
+- GTK+ 3 & dependencies
+- webkit2gtk (optional)
+- timezonemap (optional)
+- [libublsettings](https://gitea.ublinux.ru/Applications/libublsettings)
+- [libublsettings-gtk3](https://gitea.ublinux.ru/Applications/libublsettings-gtk3)
+- [libublsettingsui-gtk3](https://gitea.ublinux.ru/Applications/libublsettingsui-gtk3)
-1. Скачайте репозитрий с утилитами
- ```
- $ git clone http://git.ublinux.ru:3000/UBGroup/ubinstall.git
- ```
-2. Перейдите в каталог ubinstall
- ```
- $ cd ubinstall
- ```
-3. Установите утилиту
- ```
- $ make
- ```
+Once you have all the necessary dependencies, you can use:
+```sh
+$ make
+```
-## Использование
+# Installation
+After a successful build, just use:
+```sh
+$ sudo make install clean
+```
-### Запуск
+# Uninstallation
+After a successful build, just use:
+```sh
+$ sudo make uninstall
+```
-Запуск утилиты возможен двумя способами:
-1. Терминал
+## Usage
- CLI версия:
- ```
- $ ubinstall.cli
- ```
- GTK версия
- ```
- $ ubinstall.gtk
- ```
+### Launch
-2. Ярлык
\ No newline at end of file
+The utility can be launched in two ways:
+1. Terminal
+
+```
+$ ubinstall-gtk
+```
+
+2. Shortcut
+
+
\ No newline at end of file
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 3706494..5258fc5 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -8,11 +8,6 @@ include_directories(${GTK_INCLUDE_DIRS})
link_directories(${GTK_LIBRARY_DIRS})
add_definitions(${GTK_CFLAGS_OTHER})
-pkg_check_modules(VTE291 REQUIRED vte-2.91)
-include_directories(${VTE291_INCLUDE_DIRS})
-link_directories(${VTE291_LIBRARY_DIRS})
-add_definitions(${VTE291_CFLAGS_OTHER})
-
pkg_check_modules(JSON REQUIRED json-c)
include_directories(${JSON_INCLUDE_DIRS})
link_directories(${JSON_LIBRARY_DIRS})
@@ -23,22 +18,18 @@ include_directories(${PWQUALITY_INCLUDE_DIRS})
link_directories(${PWQUALITY_LIBRARY_DIRS})
add_definitions(${PWQUALITY_CFLAGS_OTHER})
-# pkg_check_modules(TIMEZONEMAP REQUIRED timezonemap)
-# include_directories(${TIMEZONEMAP_INCLUDE_DIRS})
-# link_directories(${TIMEZONEMAP_LIBRARY_DIRS})
-# add_definitions(${TIMEZONEMAP_CFLAGS_OTHER})
find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
find_library(TIMEZONEMAP_LIBRARIES_FOUND timezonemap)
-option(WEBKIT_FOUND "No" OFF)
if(WEBKIT_LIBRARIES_FOUND)
- option(WEBKIT_FOUND "Yes" ON)
+ add_definitions(-DWEBKIT_INCLUDE)
PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
include_directories(${WEBKIT_INCLUDE_DIRS})
link_directories(${WEBKIT_LIBRARY_DIRS})
add_definitions(${WEBKIT_CFLAGS_OTHER})
endif()
+
if(TIMEZONEMAP_LIBRARIES_FOUND)
message("TIMEZONEMAP ENABLED")
add_definitions(-DTIMEZONEMAP_INCLUDE)
@@ -119,7 +110,7 @@ add_custom_target(
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
)
-add_definitions(-DVTE_INCLUDE)
+# add_definitions(-DVTE_INCLUDE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
-O2 -pipe -fno-plt -fexceptions \
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index 16eee29..35857e6 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -12,7 +12,7 @@
#include
#include
#include
-#ifdef WEBKIT_FOUND
+#ifdef WEBKIT_INCLUDE
#include
#endif
#include "ubl-strings.h"
@@ -1188,9 +1188,9 @@ void yon_set_max_size_from_partition(GtkTreeView *table, GtkSpinButton *spin_siz
gboolean on_yon_exit(GtkWidget *, GdkEvent *, main_window *widgets);
void on_locale_changed(GtkWidget *, main_window *);
#ifdef TIMEZONEMAP_INCLUDE
-void on_region_changed(GtkComboBox *self, main_window *widgets);
-#endif
void on_zone_changed(GtkWidget *, main_window *widgets);
+#endif
+void on_region_changed(GtkComboBox *self, main_window *widgets);
void on_page_cancel_clicked(GtkWidget *, main_window *widgets);
int yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree, char *mode, main_window *widgets);
void on_process_log_view(GtkWidget *, main_window *widgets);