diff --git a/modules/config.sh b/modules/config.sh
new file mode 100755
index 0000000..bdeade2
--- /dev/null
+++ b/modules/config.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+echo
+echo "  => Configuration"
+echo
+
+if [ $profile = server ]; then
+    # Copy scripts
+    cp scripts/* /usr/local/sbin
+fi
+
+if [ $profile = desktop ]; then
+    # Disable all managed interfaces excerpt loopback from /etc/network/interfaces file to allow NetworkManager to manage them
+    sed -i '/# The primary network interface/Q' /etc/network/interfaces
+
+    # Copy user config files
+    if [ ! -d /etc/skel/.config ]; then
+        mkdir /etc/skel/.config
+    fi
+    cp -r config/. /etc/skel/.config
+
+    for f in /home/*
+    do
+        if [ ! -d $f/.config ]; then
+            mkdir $f/.config
+        fi
+        cp -r config/. $f/.config
+        chown -R ${f##*/}:${f##*/} $f/.config
+    done
+fi
diff --git a/modules/desktop.sh b/modules/desktop.sh
deleted file mode 100755
index 3d228a0..0000000
--- a/modules/desktop.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-echo
-echo "  => Desktop"
-echo
-
-# Disable all managed interfaces excerpt loopback from /etc/network/interfaces file to allow NetworkManager to manage them
-sed -i '/# The primary network interface/Q' /etc/network/interfaces
-
-# Qt5ct and qt6ct configuration
-grep -E "(export QT_QPA_PLATFORMTHEME=qt5ct)" /etc/environment > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-    echo "export QT_QPA_PLATFORMTHEME=qt5ct" >> /etc/environment
-fi
-
-# Copy user config files
-if [ ! -d /etc/skel/.config ]; then
-    mkdir /etc/skel/.config
-fi
-cp -r config/. /etc/skel/.config
-
-for f in /home/*
-do
-    if [ ! -d $f/.config ]; then
-        mkdir $f/.config
-    fi
-    cp -r config/. $f/.config
-    chown -R ${f##*/}:${f##*/} $f/.config
-done
-
diff --git a/modules/scripts.sh b/modules/scripts.sh
deleted file mode 100755
index 7d6a732..0000000
--- a/modules/scripts.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo
-echo "  => Scripts"
-echo
-
-cp scripts/* /usr/local/sbin
diff --git a/modules/volumes.sh b/modules/volumes.sh
deleted file mode 100755
index 7a84c3f..0000000
--- a/modules/volumes.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-echo
-echo "  => Volumes"
-echo
-
-if [ ! -d /var/netig/srv ]; then
-    mkdir -p /var/netig/srv
-    echo
-    echo "   => Adjust /etc/fstab accordingly !"
-    echo
-fi
-
-if [ ! -d /var/netig/bak ]; then
-    mkdir -p /var/netig/bak
-    echo
-    echo "   => Adjust /etc/fstab accordingly !"
-    echo
-fi
diff --git a/run.sh b/run.sh
index 090df45..d0c19be 100755
--- a/run.sh
+++ b/run.sh
@@ -24,8 +24,7 @@ do
                      pkgs.sh
 		             docker.sh
                      zram.sh
-                     scripts.sh
-                     volumes.sh"
+                     config.sh"
             break
             ;;
         desktop)
@@ -34,7 +33,7 @@ do
                      firewall.sh
                      pkgs.sh
                      zram.sh
-                     desktop.sh"
+                     config.sh"
             break
             ;;
         * )