diff --git a/base/etc/skel/welcome b/base/etc/skel/welcome
index 5769a6a2..3f3cd92f 100644
--- a/base/etc/skel/welcome
+++ b/base/etc/skel/welcome
@@ -1,14 +1,26 @@
 Welcome to the Luna operating system!
 You are running on the default user account, selene.
 
-If you are familiar with Unix-style operating systems (like Linux or *BSD), you should be able to use the Luna terminal without much problems.
+If you are familiar with Unix-style operating systems (like Linux or *BSD),
+you should be able to use the Luna terminal without much problems.
 
-Following the traditional Unix filesystem structure, programs are installed in /usr/bin (/bin is a symlink to /usr/bin). The command `ls /bin` will show all commands available on your current Luna installation.
+Following the traditional Unix filesystem structure, 
+programs are installed in /usr/bin (/bin is a symlink to /usr/bin). 
+The command `ls /bin` will show all commands available on 
+your current Luna installation.
 
-Currently, because of driver limitations, the root file system is mounted read-only. Your home folder is writable, but volatile; it is created and populated on boot, and its contents will vanish after a reboot.
+Currently, because of driver limitations, 
+the root file system is mounted read-only.
+Your home folder is writable, but volatile; it is 
+created and populated on boot,
+and its contents will vanish after a reboot.
 
-The system is booted using the 'init' program. You can read its configuration files in the /etc/init directory to learn more about the boot process.
+The system is booted using the 'init' program. 
+You can read its configuration files in the /etc/init directory to 
+learn more about the boot process.
 
-Luna is free software, released under the BSD-2-Clause license. The license is included in the LICENSE file in your home directory.
+Luna is free software, released under the BSD-2-Clause license. 
+The license is included in the LICENSE file in your home directory.
 
-View the source code and read more about Luna at https://git.cloudapio.eu/apio/Luna.
+View the source code and read more about Luna at
+https://git.cloudapio.eu/apio/Luna.
diff --git a/base/etc/user/00-terminal b/base/etc/user/00-terminal
deleted file mode 100644
index 2e93a0e6..00000000
--- a/base/etc/user/00-terminal
+++ /dev/null
@@ -1,3 +0,0 @@
-Name=terminal
-Description=Start the terminal.
-Command=/usr/bin/terminal
diff --git a/base/etc/user/00-welcome b/base/etc/user/00-welcome
new file mode 100644
index 00000000..daf9781d
--- /dev/null
+++ b/base/etc/user/00-welcome
@@ -0,0 +1,3 @@
+Name=welcome
+Description=Show a welcome message for the user.
+Command=/usr/bin/editor welcome