diff --git a/files/dotfiles/tmuxp/enseignement.yml b/files/dotfiles/tmuxp/enseignement.yml
new file mode 100644
index 0000000..a2163e3
--- /dev/null
+++ b/files/dotfiles/tmuxp/enseignement.yml
@@ -0,0 +1,15 @@
+session_name: enseignement
+start_directory: /media/documents/Cours/Prof/Enseignements/2018-2019/
+shell_command_before: source config.fish
+
+
+windows:
+  - window_name: Editor
+    focus: true
+    panes:
+      - vim -c NERDTree
+  - window_name: server
+    layout: main-vertical
+    panes:
+      - blank
+      - blank
diff --git a/files/dotfiles/tmuxp/mail.yml b/files/dotfiles/tmuxp/mail.yml
new file mode 100644
index 0000000..d9264af
--- /dev/null
+++ b/files/dotfiles/tmuxp/mail.yml
@@ -0,0 +1,10 @@
+session_name: mail
+
+windows:
+  - window_name: Editor
+    focus: true
+    panes:
+      - neomutt
+  - window_name: server
+    panes:
+      - neomutt
diff --git a/files/dotfiles/tmuxp/mapytex.yml b/files/dotfiles/tmuxp/mapytex.yml
new file mode 100644
index 0000000..814b246
--- /dev/null
+++ b/files/dotfiles/tmuxp/mapytex.yml
@@ -0,0 +1,20 @@
+session_name: mapytex
+start_directory: ~/scripts/Mapytex/
+shell_command_before: source venv/bin/activate.fish
+
+
+windows:
+  - window_name: Editor
+    focus: true
+    panes:
+      - vim -c NERDTree
+  - window_name: Server
+    layout: main-vertical
+    panes:
+      - git fetch && git status
+      - tig
+  - window_name: Testing
+    layout: main-vertical
+    panes:
+      - blank
+      - blank
diff --git a/tasks/dotfiles.yml b/tasks/dotfiles.yml
index 578f6cd..a330053 100644
--- a/tasks/dotfiles.yml
+++ b/tasks/dotfiles.yml
@@ -4,7 +4,7 @@
     src: files/dotfiles/tmux.conf
     dest: /home/{{ item.username }}/.tmux.conf
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Download antibody
@@ -29,7 +29,7 @@
     src: files/dotfiles/zshrc
     dest: /home/{{ item.username }}/.zshrc
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
   when: prompt == 'zsh'
 
@@ -38,7 +38,7 @@
     src: files/dotfiles/zshrc.local
     dest: /home/{{ item.username }}/.zshrc.local
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
   when: prompt == 'zsh'
 
@@ -47,7 +47,7 @@
     src: files/dotfiles/zsh_plugins.txt
     dest: /home/{{ item.username }}/.zsh_plugins.txt
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
   when: prompt == 'zsh'
 
@@ -56,7 +56,7 @@
     src: files/dotfiles/vim/
     dest: /home/{{ item.username }}/.vim/
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Creates .vim/autoload/
@@ -70,7 +70,7 @@
     url: https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
     dest: /home/{{ item.username }}/.vim/autoload/plug.vim
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Copy vimrc
@@ -78,7 +78,7 @@
     src: files/dotfiles/vimrc
     dest: /home/{{ item.username }}/.vimrc
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Creates .ssh
@@ -86,7 +86,7 @@
     path: /home/{{ item.username }}/.ssh/
     state: directory
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Copy ssh user config
@@ -94,7 +94,7 @@
     src: files/dotfiles/sshconfig
     dest: /home/{{ item.username }}/.ssh/config
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Copy gitconfig
@@ -102,6 +102,6 @@
     src: files/dotfiles/gitconfig
     dest: /home/{{ item.username }}/.gitconfig
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
diff --git a/tasks/dotfiles_desktop.yml b/tasks/dotfiles_desktop.yml
index 8697d27..b6d6513 100644
--- a/tasks/dotfiles_desktop.yml
+++ b/tasks/dotfiles_desktop.yml
@@ -14,27 +14,19 @@
     accept_hostkey: yes
   with_items: "{{ me }}"
 
-  # - name: Install tmuxinator (Archlinux)
-  # aur:
-  #   name: tmuxinator
-  #   use: makepkg
-  #   skip_installed: true
-  # become: yes
-  # become_user: aur_builder
-  # when: ansible_distribution != 'Debian'
-  # gem:
-  #   name: tmuxinator
-  #   state: latest
-  # become: yes
-  # become_user: "{{ me }}"
-  # when: not minimal and not server
+- name: Install tmuxp (Archlinux)
+  pacman:
+    name:
+      - tmuxp
+    state: present
+  when: ansible_distribution != 'Debian'
 
-- name: Copy .tmuxinator/
+- name: Copy .tmuxp/
   copy:
-    src: files/dotfiles/tmuxinator/
-    dest: /home/{{ item.username }}/.tmuxinator/
+    src: files/dotfiles/tmuxp/
+    dest: /home/{{ item.username }}/.tmuxp/
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Install mocp (Archlinux)
@@ -49,7 +41,7 @@
     src: files/dotfiles/moc/
     dest: /home/{{ item.username }}/.moc/
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Install newsboat (Archlinux)
@@ -64,7 +56,7 @@
     src: files/dotfiles/newsboat/
     dest: /home/{{ item.username }}/.newsboat/
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Install calendar and contact synchronisation tools (Archlinux)
@@ -81,7 +73,7 @@
     src: files/dotfiles/vdirsyncer/
     dest: /home/{{ item.username }}/.config/vdirsyncer/
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"
 
 - name: Install imap synchroniser (Archlinux)
@@ -96,5 +88,5 @@
     src: files/dotfiles/mbsyncrc
     dest: /home/{{ item.username }}/.mbsyncrc
     owner: "{{ item.username }}"
-    group: "{{ item.username }}"
+    group: "{{ item.group }}"
   with_items: "{{ me }}"