diff --git a/group_vars/all b/group_vars/all
index 6cecac7..4eae7cf 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -76,6 +76,7 @@ base_packages:
     - jq
     - python-docs
     - python2-docs
+    - screen
 
 filesystem_packages:
     - dosfstools
diff --git a/roles/fonts/files/local.conf b/roles/fonts/files/local.conf
new file mode 100644
index 0000000..5c5bdbb
--- /dev/null
+++ b/roles/fonts/files/local.conf
@@ -0,0 +1,229 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+  <!-- Replacements from http://bohoomil.com/doc/05-fonts/ (until ibfonts-meta-extended) -->
+  <alias>
+    <family>serif</family>
+    <prefer><family>Heuristica</family></prefer>
+  </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer><family>Noto Sans</family></prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer><family>Liberation Mono</family></prefer>
+  </alias>
+  <alias>
+    <family>fantasy</family>
+    <prefer><family>Signika</family></prefer>
+  </alias>
+  <alias>
+    <family>cursive</family>
+    <prefer><family>TeX Gyre Chorus</family></prefer>
+  </alias>
+  <match>
+    <test name="family"><string>Arial</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Liberation Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Arial Narrow</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Liberation Sans Narrow</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Book Antiqua</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>TeX Gyre Bonum</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Calibri</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Carlito</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Cambria</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Caladea</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>New Century Schoolbook</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>TeX Gyre Schola</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Comic Sans MS</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Signika</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Consolas</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Droid Sans Mono Slashed</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Constantia</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Merriweather</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Corberl</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Merriweather Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Courier New</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Courier Prime</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Geneva</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Noto Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Georgia</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Gelasio</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Helvetica</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Liberation Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Helvetica Narrow</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Liberation Sans Narrow</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Helvetica Neue</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Open Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Impact</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Oswald</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>ITC Zapf Chancery</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>TeX Gyre Chorus</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Lucida Calligraphy</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Quintessential</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Lucida Handwriting</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Quintessential</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Lucida Casual</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>CantoraOne</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Lucida Console</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Droid Sans Mono</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Lucida Sans Typewriter</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Liberation Sans Mono</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Lucida Fax</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Luxi Mono</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Lucida Sans</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Droid Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Lucida Grande</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Droid Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Palatino Linotype</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>TeX Gyre Pagella</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>SegoeUI</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>WeblySleek UI</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Symbol</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Symbola</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Tahoma</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>DejaVu Sans Condensed</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Times New Roman</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Liberation Serif</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Trebuchet MS</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Ubuntu</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Verdana</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>DejaVu Sans</string>
+    </edit>
+  </match>
+  <match>
+    <test name="family"><string>Wingdings</string></test>
+    <edit name="family" mode="assign" binding="strong">
+      <string>Symbola</string>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/roles/fonts/meta/main.yml b/roles/fonts/meta/main.yml
deleted file mode 100644
index 72123d9..0000000
--- a/roles/fonts/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-  - { role: base }
diff --git a/roles/fonts/tasks/infinality.yml b/roles/fonts/tasks/infinality.yml
deleted file mode 100644
index 2d3718c..0000000
--- a/roles/fonts/tasks/infinality.yml
+++ /dev/null
@@ -1,50 +0,0 @@
----
-- name: Add Infinality repository to pacman
-  lineinfile: dest=/etc/pacman.conf
-              state=present
-              insertafter=EOF
-              line="{{ item.line }}"
-  with_items:
-    - { line: "[infinality-bundle]" }
-    - { line: "Server = http://bohoomil.com/repo/$arch" }
-  tags:
-    - infinality
-
-- name: Verify root gnupg directory exists
-  file: path=/root/.gnupg/ state=directory
-  tags:
-    - infinality
-
-- name: Verify dirmngr is configured
-  file: path=/root/.gnupg/dirmngr_ldapservers.conf state=touch
-  tags:
-    - infinality
-
-- name: Verify dirmngr is running
-  command: dirmngr
-  tags:
-    - infinality
-
-- name: Install Infinality repository key
-  command: pacman-key -r AE6866C7962DDE58
-  tags:
-    - infinality
-
-- name: Trust Infinality repository key
-  command: pacman-key --lsign-key AE6866C7962DDE58
-  tags:
-    - infinality
-
-- name: Update package cache
-  pacman: update_cache=yes
-  tags:
-    - infinality
-
-- name: Install Infinality bundle
-  pacman: name={{ item }} state=present
-  with_items:
-    - freetype2-infinality-ultimate
-    - fontconfig-infinality-ultimate
-    - cairo-infinality-ultimate
-  tags:
-    - infinality
diff --git a/roles/fonts/tasks/main.yml b/roles/fonts/tasks/main.yml
index 8c9466d..e2df0e0 100644
--- a/roles/fonts/tasks/main.yml
+++ b/roles/fonts/tasks/main.yml
@@ -1,5 +1,58 @@
 ---
-- include: infinality.yml
+- name: Install freetyp2
+  pacman: name=freetype2 state=present
 
-- name: Install Terminus
-  pacman: name=terminus-font state=present
+- name: Install cairo
+  pacman: name=cairo state=present
+
+- name: Install fontconfig
+  pacman: name=fontconfig state=present
+
+- name: Enable LCD filter
+  file: src=/etc/fonts/conf.avail/11-lcdfilter-default.conf
+        dest=/etc/fonts/conf.d/11-lcdfilter-default.conf
+        state=link
+
+- name: Enable sub-pixel rendering
+  file: src=/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
+        dest=/etc/fonts/conf.d/10-sub-pixel-rgb.conf
+        state=link
+
+- name: Enable hinting
+  file: src=/etc/fonts/conf.avail/10-hinting-slight.conf
+        dest=/etc/fonts/conf.d/10-hinting-slight.conf
+        state=link
+
+- name: Push font substitutions
+  copy: src=local.conf dest=/etc/fonts/local.conf
+
+- name: Install core fonts
+  pacman: name={{ item }} state=present
+  with_items:
+      - terminus-font
+      - cantarell-fonts
+      - noto-fonts
+      - ttf-dejavu
+      - ttf-liberation
+      - ttf-symbola
+      - gsfonts
+      - tex-gyre-fonts
+      - ttf-droid
+      - ttf-ubuntu-font-family
+
+- name: Install AUR fonts
+  aur: name={{ item }} user={{ user.name }}
+  with_items:
+      - ttf-signika
+      - ttf-quintessential
+      - ttf-oswald
+      - ttf-opensans
+      - ttf-merriweather-sans
+      - ttf-merriweather
+      - ttf-impallari-cantora
+      - ttf-carlito
+      - ttf-caladea
+      - ttf-courier-prime
+      - ttf-heuristica
+  tags:
+    - aur