Various changes

Back to OpenBox!