Add window borders and more keys