diff --git a/Makefile b/Makefile
index 7773d59..3c52f42 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@ init:
   	version="$$(cat VERSION.md)"; \
 	version=$${version:8}; \
 	search="s/string version_application.*"; \
-	echo $$search; \
 	replace="string version_application = \"$${version}\";"; \
 	sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \
   	echo "-- Build path: ${CMAKE_BUILD_DIR}"
@@ -84,9 +83,7 @@ uninstall:
 	done
 	@$(RM) "/usr/bin/${PKGNAME}"
 	@$(RM) "/usr/share/applications/${PKGNAME}.desktop"
-	@$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.png"
 	@$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg"
-	@$(RM) "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.svg"
 	@$(RM) "/usr/share/${PKGNAME}/ui/ublinux-logo.svg"
 	@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.glade"
 	@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
@@ -95,7 +92,7 @@ uninstall:
 	@$(RM) -d "/usr/share/${PKGNAME}/css"
 	@$(RM) -d "/usr/share/${PKGNAME}/ui"
 	@$(RM) -d "/usr/share/${PKGNAME}"
-	@$(RM) "/etc/ubconfig-main.conf"
+	@$(RM) "/etc/xdg/${PKGNAME}/${PKGNAME}.conf"
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
 	@update-desktop-database --quiet 2>/dev/null
 	@touch /usr/share/applications
@@ -124,8 +121,7 @@ install: check uninstall
 	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}.glade
 	@install -Dm644 -t /usr/share/${PKGNAME}/css/ ${PKGNAME}.css
 	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ublinux-logo.svg
-	@install -Dm644 -t /etc/ ubconfig-main.conf
-	@chmod 766 /etc/ubconfig-main.conf
+	@install -Dm766 -t /etc/xdg/${PKGNAME}/ ${PKGNAME}.conf
 	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}-banner.png 
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
 	@update-desktop-database --quiet 2>/dev/null 
diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h
index df806b5..fc3293e 100644
--- a/source/ubl-settings-manager.h
+++ b/source/ubl-settings-manager.h
@@ -7,8 +7,8 @@
 
 #define GladePath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager.glade"
 #define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css"
-#define GlobalConfigPath "/etc/ubconfig-main.conf"
-#define UserConfigPath "/.config/ubl-settings-manager/ubconfig-main.conf"
+#define GlobalConfigPath "/etc/xdg/ubl-settings-manager/ubl-settings-manager.conf"
+#define UserConfigPath "/.config/ubl-settings-manager/ubl-settings-manager.conf"
 #define AppIconPath "ubl-settings-manager"
 #define AppBannerPath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager-banner.png"
 #define DesktopPath "/usr/share/applications/"