diff --git a/Makefile b/Makefile
index 8c69de3..ebf196f 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ FILE_VERSION = VERSION.md
 DEPENDS = /bin/cmake
 PREFIX ?= /usr
 PKGNAME = $(MAKEFILE_DIR)
-#PKGNAME = ubl-settings-manager
+#PKGNAME = ubl-settings-datetime
 
 default_target: all
 
@@ -24,7 +24,7 @@ all: init build
 
 init:
 	@echo "Initialize ..."; \
-	sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-quotas.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:
@@ -85,6 +85,8 @@ 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/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
 	@$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}"
 	@if [ -z ${DESTDIR} ]; then \
@@ -106,20 +108,21 @@ 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 svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+		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 "${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}/etc/xdg"
 	@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}/ui/" "${PKGNAME}-banner.png"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-quotas.checked.svg"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-quotas.warning.svg"
+	@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; \
@@ -145,13 +148,12 @@ 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 "... up_ver"
+	@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"