diff --git a/configs.yml b/configs.yml
index 057f5da..a003907 100644
--- a/configs.yml
+++ b/configs.yml
@@ -24,19 +24,6 @@ grub:
           sudo sed -i -E 's/^#?GRUB_DISABLE_SUBMENU.+/GRUB_DISABLE_SUBMENU=y/' /etc/default/grub &&
           sudo grub-mkconfig -o /boot/grub/grub.cfg
 
-kitty:
-    - install:
-        - kitty
-    - symlink:
-        - dotfiles/kitty.conf
-        - ~/.config/kitty/kitty.conf
-    - clone:
-        - https://github.com/dexpota/kitty-themes.git
-        - ~/.git_clones/kitty-themes
-    - symlink:
-        - ~/.git_clones/kitty-themes/themes/gruvbox_dark.conf
-        - ~/.config/kitty/theme.conf
-
 bash:
     - install:
         - bash-completion
diff --git a/playbook.yml b/playbook.yml
index 3078d17..072c650 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -3,6 +3,7 @@
 - hosts: localhost
   roles:
     - base
+    - kitty
     - terminator
     - neovim
     - ssh-agent
diff --git a/dotfiles/kitty.conf b/roles/kitty/files/kitty.conf
similarity index 100%
rename from dotfiles/kitty.conf
rename to roles/kitty/files/kitty.conf
diff --git a/roles/kitty/tasks/main.yml b/roles/kitty/tasks/main.yml
new file mode 100644
index 0000000..29f9f5d
--- /dev/null
+++ b/roles/kitty/tasks/main.yml
@@ -0,0 +1,29 @@
+---
+
+- name: Install kitty (Archlinux)
+  become: true
+  pacman:
+    name:
+      - kitty
+  when: ansible_distribution == 'Archlinux'
+
+- name: Install kitty (Debian)
+  become: true
+  apt:
+    name:
+      - kitty
+  when: ansible_distribution == 'Debian'
+
+- name: Copy kitty config
+  copy:
+    src: kitty.conf
+    dest: ~/.config/kitty/kitty.conf
+
+- name: Clone kitty themes
+  command: git clone https://github.com/dexpota/kitty-themes.git ~/.git_clones/kitty-themes
+
+- name: Symlink the kitty theme
+  file:
+    src: ~/.git_clones/kitty-themes/themes/gruvbox_dark.conf
+    path: ~/.config/kitty/theme.conf
+    state: link