Some more cleanup/customizaiton

Actually using it on my laptop now, whee!