hokietux theme: cleaning up the code a bit