Added edit-server. Updated custom defaults