diff --git a/group_vars/all.yml b/group_vars/all.yml
index 21784ef..780bfc4 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -5,7 +5,7 @@ ansible_header: |
     +++++++++++++++++++++++++++++++++++++++++++++++++++
 
        Ansible managed, don't modify the file locally.
-       See https://gitlab.crans.org/nounous/ansible.
+       See https://gitlab.crans.org/ynerant/templier-ansible.
        {% if template_path is defined %}{% set _, rpath = template_path.split('roles/', 1) %}Commit: {% if dirty %}({{dirty}}) {% endif %}{{ lookup('pipe', 'git log -n 1 --pretty=format:%H -- ' + template_path | quote) }}
        {% if dirty %}Run by: {{ ansible_env.SUDO_USER }}
        {% else %}Author: {{ lookup('pipe', 'git log -n 1 --pretty=format:%an -- ' + template_path | quote) }}
diff --git a/host_vars/ynerant-thinkpad.wifi.sand.auro.re.yml b/host_vars/ynerant-thinkpad.wifi.sand.auro.re.yml
index b112e13..73d7837 100644
--- a/host_vars/ynerant-thinkpad.wifi.sand.auro.re.yml
+++ b/host_vars/ynerant-thinkpad.wifi.sand.auro.re.yml
@@ -6,4 +6,5 @@ user:
 laptop:
   numpad: false
   resolution: 1080p
+  touchscreen: true
   gpu: false
diff --git a/roles/bind/templates/named.conf.local.j2 b/roles/bind/templates/named.conf.local.j2
index 4e86694..8695d2f 100644
--- a/roles/bind/templates/named.conf.local.j2
+++ b/roles/bind/templates/named.conf.local.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment('//') }}
+
 //
 // Do any local configuration here
 //
diff --git a/roles/communication/templates/gtkrc.j2 b/roles/communication/templates/gtkrc.j2
index 893114a..3800028 100644
--- a/roles/communication/templates/gtkrc.j2
+++ b/roles/communication/templates/gtkrc.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 # DO NOT EDIT! This file will be overwritten by LXAppearance.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
diff --git a/roles/communication/templates/index.theme.j2 b/roles/communication/templates/index.theme.j2
index 0deb7dc..454f4f5 100644
--- a/roles/communication/templates/index.theme.j2
+++ b/roles/communication/templates/index.theme.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [Icon Theme]
 Name=Default
 Comment=Default Cursor Theme
diff --git a/roles/communication/templates/settings.ini.j2 b/roles/communication/templates/settings.ini.j2
index c574c0b..90a835f 100644
--- a/roles/communication/templates/settings.ini.j2
+++ b/roles/communication/templates/settings.ini.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [Settings]
 gtk-theme-name=Adwaita-dark
 gtk-icon-theme-name=Adwaita
diff --git a/roles/docker/templates/update-motd.d/05-service.j2 b/roles/docker/templates/update-motd.d/05-service.j2
index ce5faaa..5aa77b0 100755
--- a/roles/docker/templates/update-motd.d/05-service.j2
+++ b/roles/docker/templates/update-motd.d/05-service.j2
@@ -1,3 +1,3 @@
 #!/bin/sh
-# {{ ansible_managed }}
+{{ ansible_header | comment }}
 echo "> Les recettes Docker-compose se trouvent dans /var/local/ansible-docker"
diff --git a/roles/i3/templates/i3.j2 b/roles/i3/templates/i3.j2
index de3b195..8b03ec2 100644
--- a/roles/i3/templates/i3.j2
+++ b/roles/i3/templates/i3.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 # This file has been auto-generated by i3-config-wizard(1).
 # It will not be overwritten, so edit it as you like.
 #
@@ -33,8 +35,8 @@ title_align center
 hide_edge_borders both
 
 # Bindings for volume and light
-bindsym XF86MonBrightnessDown exec light -U 10
-bindsym XF86MonBrightnessUp exec light -A 10
+bindsym XF86MonBrightnessDown exec light -U 1
+bindsym XF86MonBrightnessUp exec light -A 1
 bindsym XF86AudioRaiseVolume exec volume -A 5 && $refresh
 bindsym XF86AudioLowerVolume exec volume -U 5 && $refresh
 bindsym Shift+XF86MonBrightnessDown exec light -U 1
@@ -67,10 +69,14 @@ bindsym $mod+Shift+q kill
 bindsym $mod+d exec dmenu_run -l 1 -p '[ ynerant@morgoth ~ ]'
 bindsym XF86Search exec dmenu_run -l 1
 
-# Screenshots
-bindsym Print exec scrot 'Pictures/Screenshots/%Y-%m-%d-%s.jpg'
-bindsym --release Shift+Print exec scrot -s "Pictures/Screenshots/$(ls Pictures/Screenshots/ | dmenu)"
+# Launch passmenu
+bindsym $mod+t exec passmenu
 
+# Screenshots
+bindsym --release Print exec screenshot
+bindsym --release Control+Print exec screenshot -c
+bindsym --release Shift+Print exec screenshot -s
+bindsym --release Control+Shift+Print exec screenshot -s -c
 
 # Binding to lock screen
 bindsym $mod+Escape exec physlock
@@ -229,3 +235,7 @@ bar {
   status_command i3status
   strip_workspace_numbers yes
 }
+
+{% if laptop.touchscreen %}
+exec xinput --set-prop 13 "libinput Natural Scrolling Enabled" 1
+{% endif %}
diff --git a/roles/i3/templates/i3status.j2 b/roles/i3/templates/i3status.j2
index c6d2eb4..e568dfc 100644
--- a/roles/i3/templates/i3status.j2
+++ b/roles/i3/templates/i3status.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 # i3status configuration file.
 # see "man i3status" for documentation.
 
@@ -23,17 +25,17 @@ order += "tztime local"
 
 
 ipv6 {
- format_up = "IPV6"
+ format_up = "IPV6: %ip"
  format_down = ""
 }
 
 wireless _first_ {
-  format_up = "W:%essid"
+  format_up = "W:%essid, %ip"
   format_down = ""
 }
 
 ethernet _first_ {
-  format_up = "E: %speed"
+  format_up = "E: %ip, %speed"
   format_down = ""
 }
 
@@ -45,7 +47,7 @@ battery all {
 }
 
 tztime local {
-  format = "%d-%m %H:%M"
+  format = "%d-%m %H:%M:%S"
 }
 
 volume master {
diff --git a/roles/mime/templates/mimeapps.list.j2 b/roles/mime/templates/mimeapps.list.j2
index 4162bd9..19edd03 100644
--- a/roles/mime/templates/mimeapps.list.j2
+++ b/roles/mime/templates/mimeapps.list.j2
@@ -1,3 +1,4 @@
+{{ ansible_header | comment }}
 
 [Default Applications]
 text/html=firefox.desktop
diff --git a/roles/multimedia/templates/mpv.conf.j2 b/roles/multimedia/templates/mpv.conf.j2
index 916ac39..a79acae 100644
--- a/roles/multimedia/templates/mpv.conf.j2
+++ b/roles/multimedia/templates/mpv.conf.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 ##################
 # video settings #
 ##################
diff --git a/roles/multimedia/templates/zathurarc.j2 b/roles/multimedia/templates/zathurarc.j2
index 613ded3..9bf7236 100644
--- a/roles/multimedia/templates/zathurarc.j2
+++ b/roles/multimedia/templates/zathurarc.j2
@@ -1,3 +1,3 @@
+{{ ansible_header | comment }}
+
 set selection-clipboard clipboard
-set recolor true
-set recolor-lightcolor "#121212"
diff --git a/roles/notification/templates/dunstrc.j2 b/roles/notification/templates/dunstrc.j2
index 0ac74be..fed1b46 100644
--- a/roles/notification/templates/dunstrc.j2
+++ b/roles/notification/templates/dunstrc.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [global]
     ### Display ###
 
diff --git a/roles/ntp/templates/ntp.conf.j2 b/roles/ntp/templates/ntp.conf.j2
index 5250c80..6530754 100644
--- a/roles/ntp/templates/ntp.conf.j2
+++ b/roles/ntp/templates/ntp.conf.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 # Please consider joining the pool:
 #
 #     http://www.pool.ntp.org/join.html
diff --git a/roles/sudo/templates/sudoers.j2 b/roles/sudo/templates/sudoers.j2
index 61ead50..07f9e6b 100644
--- a/roles/sudo/templates/sudoers.j2
+++ b/roles/sudo/templates/sudoers.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 ## sudoers file.
 ##
 ## This file MUST be edited with the 'visudo' command as root.
@@ -39,7 +41,7 @@
 # Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET"
 ##
 ## Run X applications through sudo; HOME is used to find the
-## .Xauthority file.  Note that other programs use HOME to find   
+## .Xauthority file.  Note that other programs use HOME to find
 ## configuration files and this may lead to privilege escalation!
 # Defaults env_keep += "HOME"
 ##
diff --git a/roles/systemd/templates/logind.conf.j2 b/roles/systemd/templates/logind.conf.j2
index 23f5f9b..db54ed5 100644
--- a/roles/systemd/templates/logind.conf.j2
+++ b/roles/systemd/templates/logind.conf.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
diff --git a/roles/systemd/templates/override.conf.j2 b/roles/systemd/templates/override.conf.j2
index f9781ba..b8412bb 100644
--- a/roles/systemd/templates/override.conf.j2
+++ b/roles/systemd/templates/override.conf.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [Service]
 ExecStart=
 ExecStart=-/usr/bin/agetty --autologin {{ user.name }} --noclear %I $TERM
diff --git a/roles/terminal/templates/terminalrc.j2 b/roles/terminal/templates/terminalrc.j2
index 31147f6..0a57636 100644
--- a/roles/terminal/templates/terminalrc.j2
+++ b/roles/terminal/templates/terminalrc.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 [Configuration]
 MiscAlwaysShowTabs=FALSE
 MiscBell=TRUE
@@ -28,7 +30,7 @@ MiscSearchDialogOpacity=100
 MiscShowUnsafePasteDialog=FALSE
 TitleMode=TERMINAL_TITLE_HIDE
 ScrollingBar=TERMINAL_SCROLLBAR_NONE
-FontName=Monospace 8
+FontName=Monospace 12
 ShortcutsNoMnemonics=TRUE
 ShortcutsNoHelpkey=TRUE
 ScrollingOnOutput=FALSE
diff --git a/roles/vim/templates/vimrc.j2 b/roles/vim/templates/vimrc.j2
index e981427..924d1e2 100644
--- a/roles/vim/templates/vimrc.j2
+++ b/roles/vim/templates/vimrc.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 if has('autocmd')
   filetype plugin indent on
 endif
diff --git a/roles/xorg/templates/30-touchpad.conf.j2 b/roles/xorg/templates/30-touchpad.conf.j2
index 20b67a3..8337b87 100644
--- a/roles/xorg/templates/30-touchpad.conf.j2
+++ b/roles/xorg/templates/30-touchpad.conf.j2
@@ -1,3 +1,5 @@
+{{ ansible_header | comment }}
+
 Section "InputClass"
 	Identifier "touchpad"
 	Driver "libinput"
diff --git a/roles/xorg/templates/postswitch.j2 b/roles/xorg/templates/postswitch.j2
index c0fbbb3..32b1042 100644
--- a/roles/xorg/templates/postswitch.j2
+++ b/roles/xorg/templates/postswitch.j2
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+{{ ansible_header | comment }}
+
 ~/.fehbg
diff --git a/roles/xorg/templates/xinitrc.j2 b/roles/xorg/templates/xinitrc.j2
index a532d42..5a8c75e 100644
--- a/roles/xorg/templates/xinitrc.j2
+++ b/roles/xorg/templates/xinitrc.j2
@@ -1,8 +1,9 @@
+{{ ansible_header | comment }}
+
 eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh)
 export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
 dbus-update-activation-environment --systemd DISPLAY
 
-
 setxkbmap fr oss
 xss-lock -- physlock -d &
 autorandr --change