diff --git a/config/automatrop/roles/software/tasks/main.yml b/config/automatrop/roles/software/tasks/main.yml
index 8956ddd..09143f5 100644
--- a/config/automatrop/roles/software/tasks/main.yml
+++ b/config/automatrop/roles/software/tasks/main.yml
@@ -67,6 +67,14 @@
   become: yes
   when: arch_based
 
+- name: Enable makepkg color
+  replace:
+    path: /etc/makepkg.conf
+    regexp: '^BUILDENV=(.+)!color(.+)$'
+    replace: 'BUILDENV=\1color\2'
+  become: yes
+  when: arch_based
+
 - name: Enable makepkg ccache
   replace:
     path: /etc/makepkg.conf
@@ -75,6 +83,24 @@
   become: yes
   when: arch_based
 
+- name: Remove -mtune from makepkg CFLAGS
+  replace:
+    path: /etc/makepkg.conf
+    regexp: '^#? *CFLAGS=(.+)-mtune=\S+\s(.*)$'
+    replace: "CFLAGS=\\1\\2"
+  become: yes
+  when: arch_based
+  tags: g
+
+- name: Change -march to native from makepkg CFLAGS
+  replace:
+    path: /etc/makepkg.conf
+    regexp: '^#? *CFLAGS=(.+)-march=\S+(\s)(.*)$'
+    replace: "CFLAGS=\\1-march=native\\2\\3"
+  become: yes
+  when: arch_based
+  tags: g
+
 - name: Set makepkg MAKEFLAGS
   replace:
     path: /etc/makepkg.conf
@@ -85,14 +111,6 @@
     j: "{{ [ansible_processor_nproc - 1, 1] | max | int }}"
   when: arch_based
 
-- name: Enable makepkg color
-  replace:
-    path: /etc/makepkg.conf
-    regexp: '^BUILDENV=(.+)!color(.+)$'
-    replace: 'BUILDENV=\1color\2'
-  become: yes
-  when: arch_based
-
 - name: Enable pacman ParallelDownloads
   lineinfile:
     path: /etc/pacman.conf
@@ -161,6 +179,9 @@
   notify: "software changed"
   tags: softwarelist
 
+- debug:
+    msg: "{{ packages }}"
+
 - name: Install packages (Arch-based)
   aur:
     name: "{{ packages }}"
diff --git a/config/automatrop/roles/system/files/xorg/joystick.conf b/config/automatrop/roles/system/files/xorg/joystick.conf
index 1765eb8..91713da 100644
--- a/config/automatrop/roles/system/files/xorg/joystick.conf
+++ b/config/automatrop/roles/system/files/xorg/joystick.conf
@@ -6,3 +6,10 @@ Section "InputClass"
         Option "StartKeysEnabled" "False"       #Disable mouse
         Option "StartMouseEnabled" "False"      #support
 EndSection
+# Same thing for DualShock 4 touchpad
+Section "InputClass"
+       Identifier   "ds4-touchpad"
+       Driver       "libinput"
+       MatchProduct "Wireless Controller Touchpad"
+       Option       "Ignore" "True"
+EndSection