Added capitalized windows to switch