Clean up code and add Crunchbang support.