Change window design; Add support for libraries