diff --git a/roles/i3/tasks/main.yml b/roles/i3/tasks/main.yml
index aeecf03..25ad56a 100644
--- a/roles/i3/tasks/main.yml
+++ b/roles/i3/tasks/main.yml
@@ -43,7 +43,7 @@
   when: ansible_facts['distribution'] == 'Debian'
 
 - name: Clone repos
-  git: repo={{ item.repo }} dest={{ item.dest }} clone=yes update=no version=master
+  git: repo={{ item.repo }} dest={{ item.dest }} clone=true update=false version=master
   with_items:
     - {repo: 'https://github.com/addy-dclxvi/i3-starterpack.git', dest: '~/.git_clones/i3-starterpack'}
     - {repo: 'https://github.com/vivien/i3blocks-contrib.git', dest: '~/.git_clones/i3blocks-contrib'}
@@ -120,6 +120,7 @@
         dest: ~/.git_clones/i3blocks
         clone: true
         update: false
+        version: master
     - name: Build
       shell:
         cmd: ./autogen.sh && ./configure && make
diff --git a/roles/kitty/tasks/main.yml b/roles/kitty/tasks/main.yml
index 1ca142f..2ca387a 100644
--- a/roles/kitty/tasks/main.yml
+++ b/roles/kitty/tasks/main.yml
@@ -17,18 +17,21 @@
   file:
     path: ~/.config/kitty
     state: directory
+    mode: 0755
 
 - name: Copy kitty config
   copy:
     src: kitty.conf
     dest: ~/.config/kitty/kitty.conf
+    mode: 0644
 
 - name: Clone kitty-themes
   git:
     repo: https://github.com/dexpota/kitty-themes.git
     dest: ~/.git_clones/kitty-themes
-    clone: yes
-    update: no
+    clone: true
+    update: false
+    version: master
 
 - name: Symlink the kitty theme
   file: