Merged window-config.el with basic-config.el