Ajusted kbd, pre tag style, moved some vars