diff --git a/Makefile b/Makefile
index c12583f..7e4f260 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,6 @@ LIBS_BASE = \
 SHARED_BASE = \
 	data/pacman-default.conf \
 	data/pacman-multilib.conf \
-	data/desktop.map \
-	data/linux.preset \
 	data/pacman-mirrors.conf
 
 LIST_PKG = \
@@ -111,6 +109,10 @@ LIBS_YAML = \
 	lib/util-yaml.sh
 
 SHARED_YAML = \
+	data/desktop.map \
+	data/linux.preset
+
+SCHEMAS = \
 	data/schemas/bootloader.schema.yaml \
 	data/schemas/chrootcfg.schema.yaml \
 	data/schemas/displaymanager.schema.yaml \
@@ -231,8 +233,11 @@ install_yaml:
 	install -dm0755 $(DESTDIR)$(PREFIX)/lib/manjaro-tools
 	install -m0644 ${LIBS_YAML} $(DESTDIR)$(PREFIX)/lib/manjaro-tools
 
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools
+	install -m0644 ${SHARED_YAML} $(DESTDIR)$(PREFIX)/share/manjaro-tools
+
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools/schemas
-	install -m0644 ${SHARED_YAML} $(DESTDIR)$(PREFIX)/share/manjaro-tools/schemas
+	install -m0644 ${SCHEMAS} $(DESTDIR)$(PREFIX)/share/manjaro-tools/schemas
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
 	gzip -c man/check-yaml.1 > $(DESTDIR)$(PREFIX)/share/man/man1/check-yaml.1.gz
@@ -269,7 +274,8 @@ uninstall_iso:
 uninstall_yaml:
 	for f in ${BIN_YAML}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	for f in ${LIBS_YAML}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
-	for f in ${SHARED_YAML}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/schemas/$$f; done
+	for f in ${SCHEMAS}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/schemas/$$f; done
+	for f in ${SHARED_YAML}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
 	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/check-yaml.1.gz
 
 install: install_base install_pkg install_iso install_yaml
diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 475a08b..aa88e9a 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -201,19 +201,6 @@ configure_system(){
     esac
 }
 
-configure_live_image(){
-    msg "Configuring [live-image]"
-    detect_desktop_env "$1"
-    configure_hosts "$1"
-    configure_lsb "$1"
-    configure_mhwd "$1"
-    configure_system "$1"
-    configure_services "$1"
-    configure_calamares "$1"
-    write_live_session_conf "$1"
-    msg "Done configuring [live-image]"
-}
-
 make_repo(){
     repo-add $1${mhwd_repo}/mhwd.db.tar.gz $1${mhwd_repo}/*pkg*z
 }
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 3883a9a..0cab27c 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -255,6 +255,19 @@ mount_image_select(){
     fi
 }
 
+configure_live_image(){
+    msg "Configuring [live-image]"
+    detect_desktop_env "$1"
+    configure_hosts "$1"
+    configure_lsb "$1"
+    configure_mhwd "$1"
+    configure_system "$1"
+    configure_services "$1"
+    configure_calamares "$1"
+    write_live_session_conf "$1"
+    msg "Done configuring [live-image]"
+}
+
 make_image_live() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
         msg "Prepare [Live installation] (live-image)"
diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 7065465..ad5969a 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -9,6 +9,38 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+load_desktop_map(){
+    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g" \
+        file=${DATADIR}/desktop.map
+    local desktop_map=$(sed "$_com_rm" "$file" \
+            | sed "$_space" \
+            | sed "$_clean")
+    echo ${desktop_map}
+}
+
+detect_desktop_env(){
+    local xs=$1/usr/share/xsessions ex=$1/usr/bin key val map=( $(load_desktop_map) )
+    default_desktop_file="none"
+    default_desktop_executable="none"
+    for item in "${map[@]}";do
+        key=${item%:*}
+        val=${item#*:}
+        if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then
+            default_desktop_file="$key"
+            default_desktop_executable="$val"
+        fi
+    done
+}
+
+is_valid_de(){
+    if [[ ${default_desktop_executable} != "none" ]] && \
+    [[ ${default_desktop_file} != "none" ]]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
 write_machineid_conf(){
     local conf="${modules_dir}/machineid.conf" switch='false'
     msg2 "Writing %s ..." "${conf##*/}"
diff --git a/lib/util.sh b/lib/util.sh
index f2c600a..7e439da 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -473,38 +473,6 @@ get_edition(){
     echo ${path##*/}
 }
 
-load_desktop_map(){
-    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g" \
-        file=${DATADIR}/desktop.map
-    local desktop_map=$(sed "$_com_rm" "$file" \
-            | sed "$_space" \
-            | sed "$_clean")
-    echo ${desktop_map}
-}
-
-detect_desktop_env(){
-    local xs=$1/usr/share/xsessions ex=$1/usr/bin key val map=( $(load_desktop_map) )
-    default_desktop_file="none"
-    default_desktop_executable="none"
-    for item in "${map[@]}";do
-        key=${item%:*}
-        val=${item#*:}
-        if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then
-            default_desktop_file="$key"
-            default_desktop_executable="$val"
-        fi
-    done
-}
-
-is_valid_de(){
-    if [[ ${default_desktop_executable} != "none" ]] && \
-    [[ ${default_desktop_file} != "none" ]]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
 reset_profile(){
     unset displaymanager
     unset autologin