diff --git a/packages/tos-desktop-browser/PKGBUILD b/packages/tos-app-browser/PKGBUILD
similarity index 90%
rename from packages/tos-desktop-browser/PKGBUILD
rename to packages/tos-app-browser/PKGBUILD
index fdfa8c2..d22279c 100644
--- a/packages/tos-desktop-browser/PKGBUILD
+++ b/packages/tos-app-browser/PKGBUILD
@@ -1,10 +1,10 @@
-pkgname='tos-desktop-browser'
+pkgname='tos-app-browser'
 pkgdesc='Browser for Tipragot OS'
 arch=('any')
 url='https://git.tipragot.fr/tipragot/tos'
 license=('MIT')
 
-pkgver='0.1.1'
+pkgver='0.1.0'
 pkgrel='1'
 depends=('tos-desktop-core' 'qutebrowser' 'gst-libav' 'gst-plugins-base' 'gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly')
 source=('config.py')
diff --git a/packages/tos-desktop-browser/config.py b/packages/tos-app-browser/config.py
similarity index 100%
rename from packages/tos-desktop-browser/config.py
rename to packages/tos-app-browser/config.py
diff --git a/packages/tos-app-launcher/PKGBUILD b/packages/tos-app-launcher/PKGBUILD
new file mode 100644
index 0000000..fa9411e
--- /dev/null
+++ b/packages/tos-app-launcher/PKGBUILD
@@ -0,0 +1,9 @@
+pkgname='tos-app-launcher'
+pkgdesc='An app launcher of Tipragot OS'
+arch=('any')
+url='https://git.tipragot.fr/tipragot/tos'
+license=('MIT')
+
+pkgver='0.1.0'
+pkgrel='1'
+depends=('tos-desktop-core' 'rofi')
diff --git a/packages/tos-app-terminal/PKGBUILD b/packages/tos-app-terminal/PKGBUILD
new file mode 100644
index 0000000..d626e14
--- /dev/null
+++ b/packages/tos-app-terminal/PKGBUILD
@@ -0,0 +1,16 @@
+pkgname='tos-app-terminal'
+pkgdesc='Terminal for Tipragot OS'
+arch=('any')
+url='https://git.tipragot.fr/tipragot/tos'
+license=('MIT')
+
+pkgver='0.1.0'
+pkgrel='1'
+depends=('tos-desktop-core' 'alacritty' 'tos-programs')
+source=('config.toml')
+cksums=('SKIP')
+
+package() {
+    mkdir -p ${pkgdir}/etc/tos/dotfiles/.config/alacritty
+    cp ${srcdir}/config.toml ${pkgdir}/etc/tos/dotfiles/.config/alacritty/alacritty.toml
+}
diff --git a/packages/tos-desktop-terminal/config.toml b/packages/tos-app-terminal/config.toml
similarity index 100%
rename from packages/tos-desktop-terminal/config.toml
rename to packages/tos-app-terminal/config.toml
diff --git a/packages/tos-apps/PKGBUILD b/packages/tos-apps/PKGBUILD
new file mode 100644
index 0000000..707b88c
--- /dev/null
+++ b/packages/tos-apps/PKGBUILD
@@ -0,0 +1,9 @@
+pkgname='tos-apps'
+pkgdesc='The GUI applications of Tipragot OS'
+arch=('any')
+url='https://git.tipragot.fr/tipragot/tos'
+license=('MIT')
+
+pkgver='0.1.0'
+pkgrel='1'
+depends=('tos-app-launcher' 'tos-app-browser' 'tos-app-terminal')
diff --git a/packages/tos-core/PKGBUILD b/packages/tos-core/PKGBUILD
index fd33383..cff2419 100644
--- a/packages/tos-core/PKGBUILD
+++ b/packages/tos-core/PKGBUILD
@@ -15,4 +15,7 @@ depends=(
     
     # Utilities
     'lvm2' 'sudo'
+
+    # Dotfiles syncronisation
+    'tos-dotfiles'
 )
diff --git a/packages/tos-desktop-core/PKGBUILD b/packages/tos-desktop-core/PKGBUILD
index 812ed69..c2443f6 100644
--- a/packages/tos-desktop-core/PKGBUILD
+++ b/packages/tos-desktop-core/PKGBUILD
@@ -4,9 +4,9 @@ arch=('any')
 url='https://git.tipragot.fr/tipragot/tos'
 license=('MIT')
 
-pkgver='0.1.4'
+pkgver='0.1.5'
 pkgrel='1'
-depends=('tos-core' 'xorg-server' 'tos-fonts')
+depends=('tos-core' 'xorg-server' 'ttf-fira-code')
 source=('tos-desktop.conf')
 cksums=('SKIP')
 
diff --git a/packages/tos-desktop-terminal/PKGBUILD b/packages/tos-desktop-terminal/PKGBUILD
deleted file mode 100644
index 11e835a..0000000
--- a/packages/tos-desktop-terminal/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname='tos-desktop-terminal'
-pkgdesc='Terminal for Tipragot OS'
-arch=('any')
-url='https://git.tipragot.fr/tipragot/tos'
-license=('MIT')
-
-pkgver='0.2.8'
-pkgrel='1'
-depends=(
-    'tos-desktop-core' 'alacritty' 'tos-desktop-editor' 'fish' 'bat' 'exa' 'zoxide' 'fzf' 'base-devel' 'openssh' 'git'
-)
-source=('config.toml' 'config.fish')
-cksums=('SKIP' 'SKIP')
-
-package() {
-    mkdir -p ${pkgdir}/etc/tos/dotfiles/.config/alacritty
-    cp ${srcdir}/config.toml ${pkgdir}/etc/tos/dotfiles/.config/alacritty/alacritty.toml
-
-    mkdir -p ${pkgdir}/etc/tos/dotfiles/.config/fish
-    cp ${srcdir}/config.fish ${pkgdir}/etc/tos/dotfiles/.config/fish/config.fish
-}
diff --git a/packages/tos-desktop-wm/PKGBUILD b/packages/tos-desktop-wm/PKGBUILD
index 3609232..c6fc8eb 100644
--- a/packages/tos-desktop-wm/PKGBUILD
+++ b/packages/tos-desktop-wm/PKGBUILD
@@ -4,9 +4,9 @@ arch=('any')
 url='https://git.tipragot.fr/tipragot/tos'
 license=('MIT')
 
-pkgver='0.1.8'
+pkgver='0.1.9'
 pkgrel='1'
-depends=('tos-desktop-core' 'tos-desktop-terminal' 'tos-desktop-browser' 'lightdm' 'qtile' 'rofi')
+depends=('tos-desktop-core' 'lightdm' 'qtile' 'tos-apps')
 source=('lightdm.conf' 'config.py')
 cksums=('SKIP' 'SKIP')
 
diff --git a/packages/tos-desktop/PKGBUILD b/packages/tos-desktop/PKGBUILD
index 4394ced..5e547cc 100644
--- a/packages/tos-desktop/PKGBUILD
+++ b/packages/tos-desktop/PKGBUILD
@@ -6,4 +6,4 @@ license=('MIT')
 
 pkgver='0.1.0'
 pkgrel='1'
-depends=('tos-desktop-wm' 'tos-dotfiles' 'networkmanager')
+depends=('tos-desktop-wm' 'networkmanager')
diff --git a/packages/tos-fonts/PKGBUILD b/packages/tos-fonts/PKGBUILD
deleted file mode 100644
index 2165ba3..0000000
--- a/packages/tos-fonts/PKGBUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-pkgname='tos-fonts'
-pkgdesc='Fonts used in Tipragot OS'
-arch=('any')
-url='https://git.tipragot.fr/tipragot/tos'
-license=('MIT')
-
-pkgver='0.1.0'
-pkgrel='1'
-depends=('ttf-fira-code')
\ No newline at end of file
diff --git a/packages/tos-desktop-editor/PKGBUILD b/packages/tos-program-editor/PKGBUILD
similarity index 84%
rename from packages/tos-desktop-editor/PKGBUILD
rename to packages/tos-program-editor/PKGBUILD
index 5ed42b1..98f142f 100644
--- a/packages/tos-desktop-editor/PKGBUILD
+++ b/packages/tos-program-editor/PKGBUILD
@@ -1,4 +1,4 @@
-pkgname='tos-desktop-editor'
+pkgname='tos-program-editor'
 pkgdesc='Editor for Tipragot OS'
 arch=('any')
 url='https://git.tipragot.fr/tipragot/tos'
@@ -6,7 +6,7 @@ license=('MIT')
 
 pkgver='0.1.0'
 pkgrel='1'
-depends=('helix')
+depends=('tos-core' 'helix')
 source=('config.toml')
 cksums=('SKIP')
 
diff --git a/packages/tos-desktop-editor/config.toml b/packages/tos-program-editor/config.toml
similarity index 100%
rename from packages/tos-desktop-editor/config.toml
rename to packages/tos-program-editor/config.toml
diff --git a/packages/tos-program-shell/PKGBUILD b/packages/tos-program-shell/PKGBUILD
new file mode 100644
index 0000000..a588602
--- /dev/null
+++ b/packages/tos-program-shell/PKGBUILD
@@ -0,0 +1,16 @@
+pkgname='tos-program-shell'
+pkgdesc='Editor for Tipragot OS'
+arch=('any')
+url='https://git.tipragot.fr/tipragot/tos'
+license=('MIT')
+
+pkgver='0.1.0'
+pkgrel='1'
+depends=('tos-core' 'helix')
+source=('config.fish')
+cksums=('SKIP')
+
+package() {
+    mkdir -p ${pkgdir}/etc/tos/dotfiles/.config/fish
+    cp ${srcdir}/config.fish ${pkgdir}/etc/tos/dotfiles/.config/fish/config.fish
+}
diff --git a/packages/tos-desktop-terminal/config.fish b/packages/tos-program-shell/config.fish
similarity index 100%
rename from packages/tos-desktop-terminal/config.fish
rename to packages/tos-program-shell/config.fish
diff --git a/packages/tos-programs/PKGBUILD b/packages/tos-programs/PKGBUILD
new file mode 100644
index 0000000..984b0f9
--- /dev/null
+++ b/packages/tos-programs/PKGBUILD
@@ -0,0 +1,15 @@
+pkgname='tos-programs'
+pkgdesc='The terminal programs of Tipragot OS'
+arch=('any')
+url='https://git.tipragot.fr/tipragot/tos'
+license=('MIT')
+
+pkgver='0.1.0'
+pkgrel='1'
+depends=(
+    # Configured programs
+    'tos-program-shell' 'tos-program-editor'
+
+    # Not configured programs
+    'base-devel' 'htop' 'neofetch' 'bat' 'exa' 'zoxide' 'fzf' 'openssh' 'git'
+)
diff --git a/repository/tos-core-0.1.1-2-any.pkg.tar.zst b/repository/tos-core-0.1.1-2-any.pkg.tar.zst
deleted file mode 100644
index 4cc5b51..0000000
Binary files a/repository/tos-core-0.1.1-2-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-desktop-0.1.0-1-any.pkg.tar.zst b/repository/tos-desktop-0.1.0-1-any.pkg.tar.zst
deleted file mode 100644
index dae0eea..0000000
Binary files a/repository/tos-desktop-0.1.0-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-desktop-browser-0.1.1-1-any.pkg.tar.zst b/repository/tos-desktop-browser-0.1.1-1-any.pkg.tar.zst
deleted file mode 100644
index 3272ef2..0000000
Binary files a/repository/tos-desktop-browser-0.1.1-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-desktop-core-0.1.3-1-any.pkg.tar.zst b/repository/tos-desktop-core-0.1.3-1-any.pkg.tar.zst
deleted file mode 100644
index 00de360..0000000
Binary files a/repository/tos-desktop-core-0.1.3-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-desktop-terminal-0.2.7-1-any.pkg.tar.zst b/repository/tos-desktop-terminal-0.2.7-1-any.pkg.tar.zst
deleted file mode 100644
index bc53f41..0000000
Binary files a/repository/tos-desktop-terminal-0.2.7-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-desktop-wm-0.1.8-1-any.pkg.tar.zst b/repository/tos-desktop-wm-0.1.8-1-any.pkg.tar.zst
deleted file mode 100644
index 05bd2ab..0000000
Binary files a/repository/tos-desktop-wm-0.1.8-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-dotfiles-0.1.3-1-any.pkg.tar.zst b/repository/tos-dotfiles-0.1.3-1-any.pkg.tar.zst
deleted file mode 100644
index 9b4b5f9..0000000
Binary files a/repository/tos-dotfiles-0.1.3-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-drivers-amd-0.1.1-1-any.pkg.tar.zst b/repository/tos-drivers-amd-0.1.1-1-any.pkg.tar.zst
deleted file mode 100644
index 7cd1d02..0000000
Binary files a/repository/tos-drivers-amd-0.1.1-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-drivers-intel-0.1.1-1-any.pkg.tar.zst b/repository/tos-drivers-intel-0.1.1-1-any.pkg.tar.zst
deleted file mode 100644
index c7342ef..0000000
Binary files a/repository/tos-drivers-intel-0.1.1-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-drivers-nvidia-0.1.0-1-any.pkg.tar.zst b/repository/tos-drivers-nvidia-0.1.0-1-any.pkg.tar.zst
deleted file mode 100644
index 01dfe44..0000000
Binary files a/repository/tos-drivers-nvidia-0.1.0-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-fonts-0.1.0-1-any.pkg.tar.zst b/repository/tos-fonts-0.1.0-1-any.pkg.tar.zst
deleted file mode 100644
index 9e09d3e..0000000
Binary files a/repository/tos-fonts-0.1.0-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-prism-7.2-1-x86_64.pkg.tar.zst b/repository/tos-prism-7.2-1-x86_64.pkg.tar.zst
deleted file mode 100644
index 810ce8b..0000000
Binary files a/repository/tos-prism-7.2-1-x86_64.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-prism-7.2-2-x86_64.pkg.tar.zst b/repository/tos-prism-7.2-2-x86_64.pkg.tar.zst
deleted file mode 100644
index 7f676db..0000000
Binary files a/repository/tos-prism-7.2-2-x86_64.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-prism-7.3-1-x86_64.pkg.tar.zst b/repository/tos-prism-7.3-1-x86_64.pkg.tar.zst
deleted file mode 100644
index c1e6284..0000000
Binary files a/repository/tos-prism-7.3-1-x86_64.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-tools-0.1.2-1-any.pkg.tar.zst b/repository/tos-tools-0.1.2-1-any.pkg.tar.zst
deleted file mode 100644
index a67437c..0000000
Binary files a/repository/tos-tools-0.1.2-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos.db b/repository/tos.db
deleted file mode 100644
index a114aa1..0000000
Binary files a/repository/tos.db and /dev/null differ
diff --git a/repository/tos.files b/repository/tos.files
deleted file mode 100644
index 82688a6..0000000
Binary files a/repository/tos.files and /dev/null differ