diff --git a/Makefile b/Makefile
index 242bcc0..81799f1 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,12 @@ 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 = /bin/cmake
-PREFIX ?= /usr
+PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
-#PKGNAME = ubl-settings-manager
-LATEST_TAG=
+FILE_VER = source/${PKGNAME}.h
+PKGIDENT=$(subst /,-,${PREFIX})
+
 default_target: all
 
 .PHONY: all init depend debug prepare check build uninstall install clean help
@@ -24,11 +23,11 @@ all: init build
 init:
 	@echo "Initialize ..."; \
 	if [ -d ".git" ]; then \
-	    LATEST_TAG=$$(git describe --tags | sed 's/^v//'|grep -oE "^[0-9]{1,}.[0-9]{1,}"); \
+	    LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \
 	else \
-	    LATEST_TAG="0.0"; \
+	    LATEST_TAG="Development"; \
 	fi; \
-	sed -r "s/^(string version_application).*/\1=\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.h; \
+	sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \
 	echo "-- Build path: ${CMAKE_BUILD_DIR}"
 
 depend:
@@ -39,16 +38,14 @@ 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: init build
-	@echo "Debug ..."; \
+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="${PREFIX}"; \
 	fi; \
-	echo "${CMAKE_BUILD_DIR}/${PKGNAME}"; \
-	cp ${CMAKE_BUILD_DIR}/${PKGNAME} ./; \
 	echo "Debug: OK"
 
 prepare:
@@ -69,7 +66,8 @@ check:
 
 build: depend prepare
 	@echo "Build ..."; \
-	make --directory=${CMAKE_BUILD_DIR}; \
+	$(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \
+	sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
 	echo "Build: OK"
 
 uninstall:
@@ -77,7 +75,7 @@ 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="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+	    PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
 	    $(RM) "$${PATH_FILE_MO}"; \
 	done
 	@for SIZE in 16x16 32x32 48x48 scalable; do \
@@ -92,9 +90,7 @@ uninstall:
 	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
 	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
 	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.checked.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.warning.svg"
-	@$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"
+	@$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
 	@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; \
@@ -106,9 +102,9 @@ install: check uninstall
 	@echo "Install ..."
 	@for FILE_PO in $(wildcard *.po); do \
 		LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
-		install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
+		install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \
 		FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-		PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+		PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
 		echo "$${FILE_PO}"; \
 		msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \
 	done
@@ -116,23 +112,20 @@ install: check uninstall
 		install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
 		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"
-	@install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"
+	@cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy
+	@sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i
 	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
-	@install -dm755 "${DESTDIR}/etc/xdg"
-	@install -dm755 "${DESTDIR}${PREFIX}/share/applications"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
 	@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 "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
 	@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"
-	@sed -r "s/^(string version_application=\"*\").*/string version_application;/" -i source/${PKGNAME}.h; \
 
 clean:
 	@echo "Clean ..."
@@ -143,14 +136,6 @@ 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)"; \
@@ -160,5 +145,4 @@ help:
 	echo "... compile"; \
 	echo "... install"; \
 	echo "... uninstall"; \
-	echo "... clean"; \
-	echo "... up_ver"
+	echo "... clean"
\ No newline at end of file
diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c
index e9d477f..fcb13d4 100644
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@@ -171,9 +171,9 @@ main_window *setup_window(){
     widgets->LoadLocalMenuItem = yon_gtk_builder_get_widget(builder,"LoadLocalConfigurationMenuItem");
     widgets->LeftBox = yon_gtk_builder_get_widget(builder,"HeaderLeftBox");
 
-    widgets->DocumentationMenuItem = yon_gtk_builder_get_widget(builder,"DocumentationMenuItem");
-    widgets->AboutMenuItem = yon_gtk_builder_get_widget(builder,"AboutMenuItem");
-
+    widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL); // yon_gtk_builder_get_widget(builder,"DocumentationMenuItem");
+    widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL); // yon_gtk_builder_get_widget(builder,"AboutMenuItem");
+    
     widgets->FirstRowNamesTree = yon_gtk_builder_get_widget(builder,"FirstRowNamesTree");
     widgets->MainTree = yon_gtk_builder_get_widget(builder,"MainTree");