Retrofit Windows

Before

Before

After