diff --git a/roles/i3/files/arch_linux_news b/roles/i3/files/scripts/arch_linux_news
similarity index 100%
rename from roles/i3/files/arch_linux_news
rename to roles/i3/files/scripts/arch_linux_news
diff --git a/roles/i3/files/battery b/roles/i3/files/scripts/battery
similarity index 100%
rename from roles/i3/files/battery
rename to roles/i3/files/scripts/battery
diff --git a/roles/i3/files/free_disk_space b/roles/i3/files/scripts/free_disk_space
similarity index 100%
rename from roles/i3/files/free_disk_space
rename to roles/i3/files/scripts/free_disk_space
diff --git a/roles/i3/files/nagstamon b/roles/i3/files/scripts/nagstamon
similarity index 100%
rename from roles/i3/files/nagstamon
rename to roles/i3/files/scripts/nagstamon
diff --git a/roles/i3/files/newmail b/roles/i3/files/scripts/newmail
similarity index 100%
rename from roles/i3/files/newmail
rename to roles/i3/files/scripts/newmail
diff --git a/roles/i3/files/pub-ip b/roles/i3/files/scripts/pub-ip
similarity index 100%
rename from roles/i3/files/pub-ip
rename to roles/i3/files/scripts/pub-ip
diff --git a/roles/i3/tasks/main.yml b/roles/i3/tasks/main.yml
index 5af3781..68fbde9 100644
--- a/roles/i3/tasks/main.yml
+++ b/roles/i3/tasks/main.yml
@@ -132,28 +132,22 @@
     - {src: '~/.git_clones/i3blocks-contrib/apt-upgrades/apt-upgrades', path: '~/.config/i3blocks/scripts/apt-upgrades'}
   when: ansible_facts['distribution'] == 'Debian'
 
-- name: Copy scripts (All)
+- name: Copy wallpaper scripts
   ansible.builtin.copy:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     mode: 0755
   with_items:
-    - {src: 'nagstamon', dest: '~/.config/i3blocks/scripts/nagstamon'}
-    - {src: 'battery', dest: '~/.config/i3blocks/scripts/battery'}
-    - {src: 'free_disk_space', dest: '~/.config/i3blocks/scripts/free_disk_space'}
-    - {src: 'pub-ip', dest: '~/.config/i3blocks/scripts/pub-ip'}
-    - {src: 'newmail', dest: '~/.config/i3blocks/scripts/newmail'}
     - {src: 'clitip_wallpaper.sh', dest: '~/.local/bin/clitip_wallpaper.sh'}
     - {src: 'xkcd_wallpaper.sh', dest: '~/.local/bin/xkcd_wallpaper.sh'}
 
-- name: Copy scripts (Archlinux)
+- name: Copy scripts (All)
   ansible.builtin.copy:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: "{{ item }}"
+    dest: ~/.config/i3blocks/scripts/
     mode: 0755
-  with_items:
-    - {src: 'arch_linux_news', dest: '~/.config/i3blocks/scripts/arch_linux_news'}
-  when: ansible_facts['distribution'] == 'Archlinux'
+  with_fileglob:
+    - scripts/*
 
 - name: Update user dirs
   ansible.builtin.command: xdg-user-dirs-update