after merging percilla's keyboard change