misc: Cleanup
mojo: Add keylayout