Updated for Openbox