Consistify base marker name, add WIN_SIZE