diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
index dd7d3c5..c92e877 100644
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -1,82 +1,92 @@
 #   -------------------------------------------------------------
 #   Salt — Provision base software
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #   Project:        Nasqueron
 #   Created:        2016-04-09
 #   License:        Trivial work, not eligible to copyright
 #   -------------------------------------------------------------
 
 #   -------------------------------------------------------------
 #   Shells
 #   -------------------------------------------------------------
 
 shells:
   pkg:
     - installed
     - pkgs:
       - bash
       - tcsh
       - zsh
 
 #   -------------------------------------------------------------
 #   Editors
 #
 #   Disclaimer: We don't caution the views of Richard Stallman
 #   or the Church of Emacs positions.
 #   See http://geekfeminism.wikia.com/wiki/EMACS_virgins_joke
 #   -------------------------------------------------------------
 
 editors:
   pkg:
     - installed
     - pkgs:
       - vim
       - nano
       - joe
       {% if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' %}
       - emacs-nox
       {% elif grains['os'] == 'FreeBSD' %}
       - emacs-nox11
       {% endif %}
 
 
 #   -------------------------------------------------------------
 #   General UNIX utilities
 #   -------------------------------------------------------------
 
 utilities:
   pkg:
     - installed
     - pkgs:
+      - figlet
       - nmap
+      - toilet
       - tree
       - whois
+      {% if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' %}
+      - bsdmainutils
+      - sysvbanner
+      - toilet-fonts
+      {% endif %}
+      {% if grains['os'] == 'FreeBSD' %}
+      - figlet-fonts
+      {% endif %}
 
 #   -------------------------------------------------------------
 #   Development
 #   -------------------------------------------------------------
 
 dev:
   pkg:
     - installed
     - pkgs:
       - git
       - arcanist
       - colordiff
 
 #   -------------------------------------------------------------
 #   Languages
 #   -------------------------------------------------------------
 
 languages:
   pkg:
     - installed
     - pkgs:
       - python3
       {% if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' %}
       - tcl8.6-dev
       - php7.0
       {% elif grains['os'] == 'FreeBSD' %}
       - tcl86
       - php70
       {% endif %}