diff --git a/Makefile b/Makefile
index 09e1ee1..ebf196f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-#!/usr/bin/make -f
 
 #SHELL := /bin/bash
 MAKEFILE_FILEPATH := $(abspath $(lastword $(MAKEFILE_LIST)))
@@ -7,43 +6,49 @@ MAKEFILE_DIR := $(notdir $(patsubst %/,%,$(dir $(MAKEFILE_FILEPATH))))
 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
-DEPENDS = cmake
-#PKGNAME = $(MAKEFILE_DIR)
-PKGNAME = ubl-settings-bootloader
+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-datetime
 
 default_target: all
+
+.PHONY: all init depend debug prepare check build uninstall install clean up_ver help
+
 all: init build
 
 init:
 	@echo "Initialize ..."; \
-	sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-bootloader.cc; \
+	sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-datetime.cc; \
 	echo "-- Build path: ${CMAKE_BUILD_DIR}"
-     
+
 depend:
-	@echo "Check depends ..."; \
-	if [ ! -f /bin/${DEPENDS} ]; then \
-	    echo "-- Depend '${DEPENDS}' not fount !"; \
-	    exit 1; \
-	fi; \
+	@echo "Check depends ..."
+	@for FILE_DEPEND in $(DEPENDS); do \
+	    if [ ! -f $${FILE_DEPEND} ]; then \
+		echo "ERROR: Depend '$${FILE_DEPEND}' not found !"; \
+		exit 1; \
+	    fi; \
+	done; \
 	echo "Check depends: OK"
 #	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 
 debug:
 	@echo "Debug ..."
 	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
-	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr"; \
+	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
 	fi; \
 	echo "Debug: OK"
 
 prepare:
 	@echo "Prepare ..."; \
 	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
-	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"; \
+	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
 	fi; \
 	echo "Prepare: OK"
 
@@ -52,7 +57,7 @@ check:
 	if [ -f ${CMAKE_BUILD_DIR}/${PKGNAME} ]; then \
 	    echo "Check: OK"; \
 	else \
-	    echo "Check: ${CMAKE_BUILD_DIR}/${PKGNAME} not fount !"; \
+	    echo "Check: ${CMAKE_BUILD_DIR}/${PKGNAME} not found !"; \
 	    exit 1; \
 	fi
 
@@ -66,60 +71,63 @@ uninstall:
 	@for FILE_PO in $(wildcard *.po); do \
 	    LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
 	    FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-	    PATH_FILE_MO="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
-	    $(RM) "/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+	    PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+	    $(RM) "$${PATH_FILE_MO}"; \
+	done
+	@for SIZE in 16x16 32x32 48x48 scalable; do \
+	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
 	done
-#	@for SIZE in 16x16 32x32 48x48 scalable; do \
-	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${PKGNAME}.svg"; \
-	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${PKGNAME}.png"; \
-	done	
-#	@for FILE_SVG in $(wildcard *.svg); do \
+	@for FILE_SVG in $(wildcard *.svg); do \
 	    for SIZE in 16x16 32x32 48x48 scalable; do \
-	        $(RM) "/usr/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
+	        $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
 	    done; \
 	done
-	@$(RM) "/usr/bin/${PKGNAME}"	
-	@$(RM) "/usr/share/applications/${PKGNAME}.desktop"
-	@$(RM) "/usr/share/polkit-1/actions/ru.ublinux.pkexec.${PKGNAME}.exec.policy"
-	@$(RM) -rd "/usr/share/${PKGNAME}"
-	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
-	@update-desktop-database --quiet 2>/dev/null 
-	@touch /usr/share/applications
+	@$(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/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
+	@$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}"
+	@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; \
+	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+	fi
 	@echo "Uninstall: OK"
 
 install: check uninstall
 	@echo "Install ..."
 	@for FILE_PO in $(wildcard *.po); do \
 		LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
-		install -dm755 /usr/share/locale/$${LANG}/LC_MESSAGES; \
+		install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
 		FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-		PATH_FILE_MO="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
-		echo  $${FILE_PO}; \
+		PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+		echo "$${FILE_PO}"; \
 		msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \
 	done
 	@for SIZE in 16 32 48; do \
-		install -dm755 /usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps; \
-#		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data ${PKGNAME}.svg -o "/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${PKGNAME}.svg"; \
+		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"; \
 	done
-	@install -dm755 /usr/share/icons/hicolor/scalable/apps
-#	@install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.svg
-	@install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} 
-	@install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop 
-	@install -Dm644 -t /usr/share/polkit-1/actions/ com.ublinux.pkexec.${PKGNAME}.exec.policy
-	@install -dm755 /usr/share/${PKGNAME}/{ui,css,images}
-	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}.glade 
-	@install -Dm644 -t /usr/share/${PKGNAME}/css/ ubl-settings-bootloader.css 
-	@install -Dm644 -t /usr/share/${PKGNAME}/images/ logo-background.png
-#	@install -Dm644 -t /usr/share/${PKGNAME}/images/ ${PKGNAME}.png
-	@install -Dm644 -t /usr/share/${PKGNAME}/ boot-options.csv
-	@install -Dm644 -t /usr/share/${PKGNAME}/ input-options.csv
-	@install -Dm644 -t /usr/share/${PKGNAME}/ output-options.csv
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-bootloader.checked.svg"
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-bootloader.warning.svg"
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
-	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
-	@update-desktop-database --quiet 2>/dev/null 
-	@touch /usr/share/applications
+	@install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
+	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
+	@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 -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"
+	@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; \
+	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+	fi
 	@echo "Install: OK"
 
 clean:
@@ -131,6 +139,14 @@ clean:
 	    echo "Clean: OK"; \
 	fi
 
+up_ver:
+	@CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" "  -f2); \
+	MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \
+	MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \
+	VER="$${MAJOR}.$$(($${MINOR}+1))"; \
+	sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \
+	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)"
@@ -140,4 +156,4 @@ help:
 	@echo "... compile"
 	@echo "... install"
 	@echo "... uninstall"
-	@echo "... clean"
\ No newline at end of file
+	@echo "... clean"