diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index bf52da6..e1deb9e 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,5 +1,5 @@
+---
 # These are supported funding model platforms
 
 github: [DO1JLR]
 liberapay: L3D
-custom: https://paypal.me/c3woc
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..be0cacf
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,11 @@
+---
+extends: default
+
+rules:
+  # 150 chars should be enough, but don't fail if a line is longer
+  line-length:
+    max: 180
+    level: warning
+
+ignore: |
+  roles/
diff --git a/group_vars/all.yml b/group_vars/all.yml
index a9dc10e..25dfafc 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -23,55 +23,50 @@ dotfiles__additional_user_bashrc_lines:
 ssh_public_key_store: 'admin_ssh_keys'
 
 i3_keybindings_extra:
-  - keybinding:
-    name: Volume (mute/unmute)
-    key: $mod+F12
-    exec: --no-startup-id pulsemixer --toggle-mute
-  - keybinding:
-    name: Volue (default)
-    key: $mod+Shift+F12
-    exec: --no-startup-id pulsemixer --set-volume 42
-  - keybinding:
-    name: volume-up
-    key: XF86AudioRaiseVolume
-    exec: --no-startup-id pulsemixer --change-volume +3
-  - keybinding:
-    name: volume-down
-    key: XF86AudioLowerVolume
-    exec: --no-startup-id pulsemixer --change-volume -5
-  - keybinding:
-    name: darker
-    key: XF86AudioMute
-    exec: --no-startup-id pulsemixer --toggle-mute
-  - keybinding:
-    name: darker
-    key: XF86MonBrightnessDown
-    exec: --no-startup-id sudo light -U 9
-  - keybinding:
-    name: lighter
-    key: XF86MonBrightnessUp
-    exec: --no-startup-id sudo light -A 6
-
+ - keybinding:
+   name: Volume (mute/unmute)
+   key: $mod+F12
+   exec: --no-startup-id pulsemixer --toggle-mute
+ - keybinding:
+   name: Volue (default)
+   key: $mod+Shift+F12
+   exec: --no-startup-id pulsemixer --set-volume 42
+ - keybinding:
+   name: volume-up
+   key: XF86AudioRaiseVolume
+   exec: --no-startup-id pulsemixer --change-volume +3
+ - keybinding:
+   name: volume-down
+   key: XF86AudioLowerVolume
+   exec: --no-startup-id pulsemixer --change-volume -5
+ - keybinding:
+   name: darker
+   key: XF86AudioMute
+   exec: --no-startup-id pulsemixer --toggle-mute
+ - keybinding:
+   name: darker
+   key: XF86MonBrightnessDown
+   exec: --no-startup-id sudo light -U 9
+ - keybinding:
+   name: lighter
+   key: XF86MonBrightnessUp
+   exec: --no-startup-id sudo light -A 6
 
 i3_applications:
-  - application:
-    class: "firefox"
-    name: "firefox"
-    workspace: 2
-    on_startup: true
-  - application:
-    class: "Thunderbird"
-    name: "thunderbird"
-    workspace: 9
-    on_startup: true
+ - application:
+   class: "firefox"
+   name: "firefox"
+   workspace: 2
+   on_startup: true
+ - application:
+   class: "Thunderbird"
+   name: "thunderbird"
+   workspace: 9
+   on_startup: true
 
 i3_run_on_startup:
-#  - nextcloud
-  - sudo nm-applet
-
-
-
+ # - nextcloud
+ - sudo nm-applet
 
 # globaly enably simple versionscheck - if available
 submodules_versioncheck: true
-
diff --git a/host_vars/desk_minni.yml b/host_vars/desk_minni.yml
index 56a710d..1a61f53 100644
--- a/host_vars/desk_minni.yml
+++ b/host_vars/desk_minni.yml
@@ -31,16 +31,15 @@ i3_monitors:
     mode: "2560x1440"
     pos: "0x0"
     rotate: "normal"
-    workspaces: [1,2,3,4,5]
+    workspaces: [1, 2, 3, 4, 5]
   - monitor:
     id: 2
     output: "HDMI2"
     mode: "1920x1200"
     pos: "2560x0"
     rotate: "normal"
-    workspaces: [6,7,8,9,0]
+    workspaces: [6, 7, 8, 9, 0]
 
 wine_user: "lilian"
 akku_user: "lilian"
 wine_user_home: "/home/lilian"
-
diff --git a/host_vars/t460p.yml b/host_vars/t460p.yml
index a9c7ccb..db25bcb 100644
--- a/host_vars/t460p.yml
+++ b/host_vars/t460p.yml
@@ -21,4 +21,3 @@ copy_to_user: "{{ akku_user }}"
 
 wine_user: "{{ akku_user }}"
 wine_user_home: "/home/{{ akku_user }}"
-copy_to_user: "{{ akku_user }}"