fixed window shades. fixed merge conflicts with master branch