Add window remapper