use deviceID 20 (same as devicetype) as default
add more e2p default files (according new layout)