Updated to work with awesome 3.5 and specifically my system.