OK.

I've done the following:

- Removed the unused functions from all commits.
- Renamed the theme variables as you suggested
- Kept all the theme integration changes in the first commit, and all 
the mixer-related ones in the second.  Do I need to do separate pull 
requests for these?  I originally meant to do that, but I couldn't 
figure out how to do it in github's interface.
- I also changed the mixer commit so that the code just runs the mixer 
command without all the "pkill" stuff.  I then added a function 
SetMixer() so the mixer command can be customized from rc.lua.