diff --git a/dots/archinstall/common/packages.txt b/dots/archinstall/common/packages.txt
index 04c4ade..e4b690e 100644
--- a/dots/archinstall/common/packages.txt
+++ b/dots/archinstall/common/packages.txt
@@ -65,6 +65,7 @@ maim                            # screenshot utility
 man-db                          # man pages
 mousepad                        # text editor
 mpv                             # media player
+neofetch                        # display system info cli
 network-manager-applet          # nm-applet
 nextcloud-client                # nextcloud sync client
 nitrogen                        # wallpaper setter for x
diff --git a/dots/archinstall/common/services.txt b/dots/archinstall/common/services.txt
new file mode 100644
index 0000000..e414aa1
--- /dev/null
+++ b/dots/archinstall/common/services.txt
@@ -0,0 +1,4 @@
+# services
+
+lemurs.service
+cups.service
diff --git a/dots/archinstall/t470p/packages.txt b/dots/archinstall/t470p/packages.txt
index e4ee326..c3edcbd 100644
--- a/dots/archinstall/t470p/packages.txt
+++ b/dots/archinstall/t470p/packages.txt
@@ -1,3 +1 @@
 # packages
-
-neofetch                        # display system info cli
diff --git a/dots/archinstall/t470p/services.txt b/dots/archinstall/t470p/services.txt
index fa9140c..a0b12d7 100644
--- a/dots/archinstall/t470p/services.txt
+++ b/dots/archinstall/t470p/services.txt
@@ -1,2 +1 @@
-lemurs.service
-cups.service
+# services
diff --git a/dots/archinstall/tuxwarrior/packages.txt b/dots/archinstall/tuxwarrior/packages.txt
index e4ee326..c3edcbd 100644
--- a/dots/archinstall/tuxwarrior/packages.txt
+++ b/dots/archinstall/tuxwarrior/packages.txt
@@ -1,3 +1 @@
 # packages
-
-neofetch                        # display system info cli
diff --git a/dots/archinstall/tuxwarrior/services.txt b/dots/archinstall/tuxwarrior/services.txt
index fa9140c..a0b12d7 100644
--- a/dots/archinstall/tuxwarrior/services.txt
+++ b/dots/archinstall/tuxwarrior/services.txt
@@ -1,2 +1 @@
-lemurs.service
-cups.service
+# services
diff --git a/scripts/99_software.sh b/scripts/99_software.sh
index 5ac4982..fe56c4f 100644
--- a/scripts/99_software.sh
+++ b/scripts/99_software.sh
@@ -56,8 +56,7 @@ do_update() {
     param_check "${hostname}" "no host name given"
 
     echo
-    echo "installing packages for the host '${hostname}'"
-    echo
+    echo "installing packages for the host '${hostname}':"
 
     package_list_url=https://git.mz.fo/fro/lnx-arch/raw/branch/master/dots/archinstall/${hostname}/packages.txt
 
@@ -126,6 +125,41 @@ do_update() {
 
 }
 
+do_services() {
+    hostname=$1
+
+    param_check "${hostname}" "no host name given"
+
+    echo
+    echo "installing packages for the host '${hostname}':"
+
+    service_list_url=https://git.mz.fo/fro/lnx-arch/raw/branch/master/dots/archinstall/${hostname}/services.txt
+
+    trg_file=/tmp/services.txt
+
+    rm -rf ${trg_file}
+
+    wget --no-check-certificate -q ${service_list_url} -O ${trg_file}
+
+    if ! [ -s ${trg_file} ] ; then
+        echo "error: services.txt is empty"
+        echo ""
+        echo "attempted to to download 'services.txt' from:
+        echo '${service_list_url}'"
+        echo "'${hostname}' might be an invalid hostname, or 'services.txt' might be missing for given host."
+        exit 1
+    fi
+
+    mapfile -t services < ${trg_file}
+
+    list=()
+    for x in ${services[@]}
+        do
+            echo "systemctl enable ${x}"
+            systemctl enable ${x}
+    done
+
+}
 
 # -----
 # update all packages for given host
@@ -142,33 +176,8 @@ fi
 # -----
 if [ ${operation} == "services" ] ; then
 
-    param_check "${parameter}" "no host name given"
-
-    service_list_url=https://git.mz.fo/fro/lnx-arch/raw/branch/master/dots/archinstall/${parameter}/services.txt
-
-    trg_file=/tmp/services.txt
-
-    rm -rf ${trg_file}
-
-    wget --no-check-certificate -q ${service_list_url} -O ${trg_file}
-
-    if ! [ -s ${trg_file} ] ; then
-        echo "error: services.txt is empty"
-        echo ""
-        echo "attempted to to download 'services.txt' from:
-        echo '${service_list_url}'"
-        echo "'${parameter}' might be an invalid hostname, or 'services.txt' might be missing for given host."
-        exit 1
-    fi
-
-    mapfile -t services < ${trg_file}
-
-    list=()
-    for x in ${services[@]}
-        do
-            echo "systemctl enable ${x}"
-            systemctl enable ${x}
-    done
+    do_service "common"
+    do_update ${parameter}
 
 fi